diff options
author | Joseph Powers <jpowers27@cox.net> | 2011-08-29 06:29:06 -0700 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2011-08-29 06:29:36 -0700 |
commit | bbbc20bd5f4ca5ff726667869b7b7537606b2a77 (patch) | |
tree | 05014a5c013e955f86e90de2c81ddc05cf77e5a8 /sd | |
parent | Rebase XColorTable from XPropertyTable to XPropertyList (diff) | |
download | core-bbbc20bd5f4ca5ff726667869b7b7537606b2a77.tar.gz core-bbbc20bd5f4ca5ff726667869b7b7537606b2a77.zip |
Rename class XColorTable to XColorList
The class is now based on XPropertyList instead of XPropertyTable and all
of the other classed based on XPropertyList are named X..List.
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/sdabstdlg.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/dlg/copydlg.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/docshell/docshel3.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/celltempl.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/copydlg.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/inc/dlgpage.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/prltempl.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/tabtempl.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/tpaction.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2 |
13 files changed, 23 insertions, 23 deletions
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index efae95e173eb..02a9b7d372fb 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -57,7 +57,7 @@ class SfxObjectShell; class SfxObjectShellLock; class SvxFieldData; class GDIMetaFile; -class XColorTable; +class XColorList; class SdDrawDocument; class SfxMedium; class SdrObject; @@ -188,7 +188,7 @@ public: static SdAbstractDialogFactory* Create(); virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0; - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ) = 0; + virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorList* pColTab, ::sd::View* pView ) = 0; virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0; virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0; virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ) = 0; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index a10db789f2b6..cdd455a4ebfe 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -223,7 +223,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); - XColorTable* pColorTable = NULL; + XColorList* pColorTable = NULL; bool bKillTable = false; const SfxPoolItem* pItem = NULL; @@ -232,7 +232,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con if ( !pColorTable ) { - pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); + pColorTable = new XColorList( SvtPathOptions().GetPalettePath() ); bKillTable = sal_True; } @@ -1231,7 +1231,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con // fill the color box SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); - XColorTable* pColorTable = NULL; + XColorList* pColorTable = NULL; bool bKillTable = false; const SfxPoolItem* pItem = NULL; @@ -1240,7 +1240,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con if ( !pColorTable ) { - pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); + pColorTable = new XColorList( SvtPathOptions().GetPalettePath() ); bKillTable = sal_True; } diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 427ec463a5bc..2fb53f0b9d8d 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -67,7 +67,7 @@ namespace sd { CopyDlg::CopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, - XColorTable* pColTab, + XColorList* pColTab, ::sd::View* pInView ) : SfxModalDialog ( pWindow, SdResId( DLG_COPY ) ), maFtCopies ( this, SdResId( FT_COPIES ) ), diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 09bdd0d4f28a..57683a9f5f19 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -396,7 +396,7 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( //add for CopyDlg begin AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, - XColorTable* pColTab, ::sd::View* pView ) //add for CopyDlg + XColorList* pColTab, ::sd::View* pView ) //add for CopyDlg { return new AbstractCopyDlg_Impl( new ::sd::CopyDlg( pWindow, rInAttrs, pColTab, pView ) ); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index f5aa8d9d1b8c..4b6f4b76002e 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -260,7 +260,7 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory public: virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ); - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ); + virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorList* pColTab, ::sd::View* pView ); virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ); virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ); virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ); diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index b587e4f97a48..c853a6c72d8a 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -192,7 +192,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) { // passende ColorTable ist per PutItem gesetzt worden SvxColorTableItem* pColItem = (SvxColorTableItem*) GetItem( SID_COLOR_TABLE ); - XColorTable* pTable = pColItem->GetColorTable(); + XColorList* pTable = pColItem->GetColorTable(); rReq.SetReturnValue( OfaPtrItem( SID_GET_COLORTABLE, pTable ) ); } break; diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index b0164eebb7a3..ca2b3736e345 100644 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -31,7 +31,7 @@ #include <sfx2/styledlg.hxx> -class XColorTable; +class XColorList; class XGradientList; class XHatchList; class XBitmapList; @@ -41,7 +41,7 @@ class SdrModel; class SdPresCellTemplateDlg : public SfxStyleDialog { private: - XColorTable* mpColorTab; + XColorList* mpColorTab; XGradientList* mpGradientList; XHatchList* mpHatchingList; XBitmapList* mpBitmapList; diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index e45744e39fb3..17da615a5583 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -36,7 +36,7 @@ #include <vcl/fixed.hxx> #include <sfx2/basedlgs.hxx> -class XColorTable; +class XColorList; namespace sd { @@ -52,7 +52,7 @@ class CopyDlg { public: CopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, - XColorTable* pColTab, ::sd::View* pView ); + XColorList* pColTab, ::sd::View* pView ); ~CopyDlg(); void GetAttr( SfxItemSet& rOutAttrs ); @@ -89,7 +89,7 @@ private: PushButton maBtnSetDefault; const SfxItemSet& mrOutAttrs; - XColorTable* mpColorTab; + XColorList* mpColorTab; Fraction maUIScale; ::sd::View* mpView; diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 4dc783797025..40b931ae0e80 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -34,7 +34,7 @@ #include "dlgpage.hrc" class SfxObjectShell; -class XColorTable; +class XColorList; class XGradientList; class XHatchList; class XBitmapList; @@ -53,7 +53,7 @@ private: const SfxObjectShell* mpDocShell; - XColorTable* mpColorTab; + XColorList* mpColorTab; XGradientList* mpGradientList; XHatchList* mpHatchingList; XBitmapList* mpBitmapList; diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index b186f200aeca..3d502708f066 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -37,7 +37,7 @@ #include "prlayout.hxx" // fuer enum PresentationObjects -class XColorTable; +class XColorList; class XGradientList; class XHatchList; class XBitmapList; @@ -57,7 +57,7 @@ class SdPresLayoutTemplateDlg : public SfxTabDialog private: const SfxObjectShell* mpDocShell; - XColorTable* pColorTab; + XColorList* pColorTab; XGradientList* pGradientList; XHatchList* pHatchingList; XBitmapList* pBitmapList; diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index b7e46f603d0e..fccf3f789276 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -35,7 +35,7 @@ class SdrModel; class SfxObjectShell; class SdrView; -class XColorTable; +class XColorList; class XGradientList; class XBitmapList; class XDashList; @@ -54,7 +54,7 @@ private: const SfxObjectShell& rDocShell; SdrView* pSdrView; - XColorTable* pColorTab; + XColorList* pColorTab; XGradientList* pGradientList; XHatchList* pHatchingList; XBitmapList* pBitmapList; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 58f701d55a59..f3fd62d5e6c0 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -93,7 +93,7 @@ private: const SfxItemSet& rOutAttrs; const ::sd::View* mpView; SdDrawDocument* mpDoc; - XColorTable* pColTab; + XColorList* pColTab; sal_Bool bTreeUpdated; std::vector<com::sun::star::presentation::ClickAction> maCurrentActions; diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 8ade950c35a5..b09c4c4e74d5 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -264,7 +264,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c aPathURL.removeSegment(); aPathURL.removeFinalSlash(); - XColorTable* pColTab = new XColorTable( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() ); + XColorList* pColTab = new XColorList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() ); pColTab->SetName( aURL.getName() ); if( pColTab->Load() ) { |