diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-04-10 08:20:16 +0000 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <orw@apache.org> | 2013-04-10 08:20:16 +0000 |
| commit | 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5 (patch) | |
| tree | f5c258d25d3719c8f719a944043b5220377e9f9c /reportdesign/source | |
| parent | bcfee75544246db6788715d98efd6d33c12f933d (diff) | |
121420: merge sidebar feature from branch into trunk
Notes
Notes:
merged as: d50ce284c9674c45acd40d017cc44c260da722a2
Diffstat (limited to 'reportdesign/source')
| -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 993dddb58955..7908a77d61eb 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -146,7 +146,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 13006a87dd39..07be44b250ed 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -44,7 +44,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> @@ -654,7 +654,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), @@ -774,7 +774,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::GetStdColorList()) pDialog->DontDeleteColorTable(); bSuccess = ( RET_OK == pDialog->Execute() ); if ( bSuccess ) |