121420: merge sidebar feature from branch into trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 186ade97aebe..b6ff73300243 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -682,7 +682,7 @@ namespace pcr
         :OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle )
     {
         // initialize the color listbox
-        XColorTable* pColorTable = NULL;
+        XColorList* pColorTable = NULL;
         SfxObjectShell* pDocSh = SfxObjectShell::Current();
         const SfxPoolItem* pItem = pDocSh ? pDocSh->GetItem( SID_COLOR_TABLE ) : NULL;
         if ( pItem )
@@ -693,7 +693,7 @@ namespace pcr
 
         if ( !pColorTable )
         {
-            pColorTable = XColorTable::GetStdColorTable();
+            pColorTable = XColorList::GetStdColorList();
         }