summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/backgrnd.cxx
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2013-04-10 08:20:16 +0000
committerOliver-Rainer Wittmann <orw@apache.org>2013-04-10 08:20:16 +0000
commit0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5 (patch)
treef5c258d25d3719c8f719a944043b5220377e9f9c /cui/source/tabpages/backgrnd.cxx
parentbcfee75544246db6788715d98efd6d33c12f933d (diff)
121420: merge sidebar feature from branch into trunk
Notes
Diffstat (limited to 'cui/source/tabpages/backgrnd.cxx')
-rw-r--r--cui/source/tabpages/backgrnd.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 938ae0868580..f84bc459ea6c 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1194,7 +1194,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
const Size aSize15x15 = Size( 15, 15 );
FASTBOOL bOwn = sal_False;
@@ -1204,7 +1204,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
if ( !pColorTable )
{
bOwn = sal_True;
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
}
if ( pColorTable )