sdrcelldlg.cxx (2ee96f1c) sdrcelldlg.cxx (c7be74b1)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 23 unchanged lines hidden (view full) ---

32#include "cuitabarea.hxx"
33#include "svx/svdmodel.hxx"
34#include "border.hxx"
35#include <svx/dialogs.hrc> // RID_SVXPAGE_...
36
37SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
38: SfxTabDialog ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
39, mrOutAttrs ( *pAttr )
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 23 unchanged lines hidden (view full) ---

32#include "cuitabarea.hxx"
33#include "svx/svdmodel.hxx"
34#include "border.hxx"
35#include <svx/dialogs.hrc> // RID_SVXPAGE_...
36
37SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
38: SfxTabDialog ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
39, mrOutAttrs ( *pAttr )
40, mpColorTab ( pModel->GetColorTable() )
41, mpGradientList ( pModel->GetGradientList() )
42, mpHatchingList ( pModel->GetHatchList() )
43, mpBitmapList ( pModel->GetBitmapList() )
40, maColorTab ( pModel->GetColorTableFromSdrModel() )
41, maGradientList ( pModel->GetGradientListFromSdrModel() )
42, maHatchingList ( pModel->GetHatchListFromSdrModel() )
43, maBitmapList ( pModel->GetBitmapListFromSdrModel() )
44
45{
46 FreeResource();
47
48 AddTabPage( RID_SVXPAGE_CHAR_NAME );
49 AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
50 AddTabPage( RID_SVXPAGE_BORDER );
51 AddTabPage( RID_SVXPAGE_AREA );

--- 11 unchanged lines hidden (view full) ---

63{
64}
65
66void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
67{
68 switch( nId )
69 {
70 case RID_SVXPAGE_AREA:
44
45{
46 FreeResource();
47
48 AddTabPage( RID_SVXPAGE_CHAR_NAME );
49 AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
50 AddTabPage( RID_SVXPAGE_BORDER );
51 AddTabPage( RID_SVXPAGE_AREA );

--- 11 unchanged lines hidden (view full) ---

63{
64}
65
66void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
67{
68 switch( nId )
69 {
70 case RID_SVXPAGE_AREA:
71 ( (SvxAreaTabPage&) rPage ).SetColorTable( mpColorTab );
72 ( (SvxAreaTabPage&) rPage ).SetGradientList( mpGradientList );
73 ( (SvxAreaTabPage&) rPage ).SetHatchingList( mpHatchingList );
74 ( (SvxAreaTabPage&) rPage ).SetBitmapList( mpBitmapList );
71 ( (SvxAreaTabPage&) rPage ).SetColorTable( maColorTab );
72 ( (SvxAreaTabPage&) rPage ).SetGradientList( maGradientList );
73 ( (SvxAreaTabPage&) rPage ).SetHatchingList( maHatchingList );
74 ( (SvxAreaTabPage&) rPage ).SetBitmapList( maBitmapList );
75 ( (SvxAreaTabPage&) rPage ).SetPageType( PT_AREA );
76 ( (SvxAreaTabPage&) rPage ).SetDlgType( 1 );
77 ( (SvxAreaTabPage&) rPage ).SetPos( 0 );
78// ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP );
79// ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
80// ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState );
81// ( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState );
82// ( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState );

--- 15 unchanged lines hidden --- 		75 ( (SvxAreaTabPage&) rPage ).SetPageType( PT_AREA );
76 ( (SvxAreaTabPage&) rPage ).SetDlgType( 1 );
77 ( (SvxAreaTabPage&) rPage ).SetPos( 0 );
78// ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP );
79// ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
80// ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState );
81// ( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState );
82// ( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState );

--- 15 unchanged lines hidden ---