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 /reportdesign/source/ui | |
| 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 'reportdesign/source/ui')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 2825cba14163..aad4c9bc5fd0 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -151,7 +151,7 @@ OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition) m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL ); SetHelpId( HID_RPT_POPUP_COLOR ); const Size aSize12( 13, 13 ); - ::std::auto_ptr<XColorTable> pColorTable(new XColorTable( SvtPathOptions().GetPalettePath() )); + ::std::auto_ptr<XColorList> pColorTable(new XColorList( SvtPathOptions().GetPalettePath() )); short i = 0; long nCount = pColorTable->Count(); XColorEntry* pEntry = NULL; diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 6fafee3d07ca..abde2bced493 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -50,7 +50,7 @@ #include <editeng/charscaleitem.hxx> #include <svx/algitem.hxx> #include <svx/svdpagv.hxx> -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorList #include <editeng/brshitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/emphitem.hxx> @@ -657,7 +657,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep }; Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); ::std::auto_ptr<FontList> pFontList(new FontList( pParent )); - ::std::auto_ptr<XColorTable> pColorTable( new XColorTable( SvtPathOptions().GetPalettePath() )); + ::std::auto_ptr<XColorList> pColorTable( new XColorList( SvtPathOptions().GetPalettePath() )); SfxPoolItem* pDefaults[] = { new SvxFontItem(ITEMID_FONT), @@ -771,7 +771,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R // #i74099# by default, the dialog deletes the current color table if a different one is loaded // (see SwDrawShell::ExecDrawDlg) const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) ); - if (pColorItem && pColorItem->GetColorTable() == &XColorTable::GetStdColorTable()) + if (pColorItem && pColorItem->GetColorTable() == &XColorList::GetStdColorTable()) pDialog->DontDeleteColorTable(); bSuccess = ( RET_OK == pDialog->Execute() ); if ( bSuccess ) |