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 /cui/source/options/treeopt.cxx | |
| parent | bcfee75544246db6788715d98efd6d33c12f933d (diff) | |
121420: merge sidebar feature from branch into trunk
Notes
merged as: d50ce284c9674c45acd40d017cc44c260da722a2
Diffstat (limited to 'cui/source/options/treeopt.cxx')
| -rw-r--r-- | cui/source/options/treeopt.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 074e5d5f6c2e..ab0ad2fbc810 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1205,7 +1205,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) if ( SfxViewFrame::Current() && SfxViewFrame::Current()->GetDispatcher() ) pPtr = (const OfaPtrItem*)SfxViewFrame::Current()-> GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON ); - pColorTab = pPtr ? (XColorTable*)pPtr->GetValue() : XColorTable::GetStdColorTable(); + pColorTab = pPtr ? (XColorList*)pPtr->GetValue() : XColorList::GetStdColorList(); rColPage.SetColorTable( pColorTab ); rColPage.SetPageType( &nUnknownType ); @@ -2640,7 +2640,7 @@ short OfaTreeOptionsDialog::Execute() const OfaPtrItem* pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON ); if( pPtr ) { - XColorTable* _pColorTab = (XColorTable*)pPtr->GetValue(); + XColorList* _pColorTab = (XColorList*)pPtr->GetValue(); if( _pColorTab && _pColorTab->GetPath() == GetColorTable()->GetPath() && |