colorwindow: Use exactly one row of recent colors

Right now one row of SvxColorValueSet is 12 colors.

Change-Id: I9be6e8487d5325866e17f578b7abb08f7c338fb1

svx/source/tbxctrls/PaletteManager.cxx

@@ -24,13 +24,15 @@
 #include <svx/drawitem.hxx>
 #include <svx/dialogs.hrc>
 #include <svtools/colrdlg.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
 
 #define STR_DEFAULT_PAL         "Default palette"
 #define STR_DOC_COLORS          "Document colors"
 #define STR_DOC_COLOR_PREFIX    "Document Color "
 
 PaletteManager::PaletteManager() :
-    mnMaxRecentColors(10),
+    mnMaxRecentColors(Application::GetSettings().GetStyleSettings().GetColorValueSetColumnCount()),
     mnNumOfPalettes(2),
     mnCurrentPalette(0),
     mnColorCount(0),

svx/source/tbxctrls/colorwindow.hxx

@@ -47,8 +47,6 @@ private:
 
     PaletteManager&     mrPaletteManager;
 
-    const sal_uInt16    mnColorSetCols;
-
     DECL_LINK( SelectHdl, SvxColorValueSet* );
     DECL_LINK( SelectPaletteHdl, void *);
     DECL_LINK( AutoColorClickHdl, void * );

svx/source/tbxctrls/tbcontrl.cxx

@@ -1136,9 +1136,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
                     rFrame ),
     theSlotId( nSlotId ),
     maCommand( rCommand ),
-    mrPaletteManager( rPaletteManager ),
-    mnColorSetCols( 10 )
-
+    mrPaletteManager( rPaletteManager )
 {
     get(mpPaletteListBox,     "palette_listbox");
     get(mpButtonAutoColor,    "auto_color_button");
@@ -1150,9 +1148,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
     mpColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT) );
     mpRecentColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT) );
 
-    mpColorSet->SetColCount( mnColorSetCols );
     mpColorSet->layoutAllVisible(mrPaletteManager.GetColorCount());
-    mpRecentColorSet->SetColCount( mnColorSetCols );
     mpRecentColorSet->SetLineCount( 1 );
     mpRecentColorSet->layoutAllVisible(mrPaletteManager.GetRecentColorCount());