strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

colorwindow: Use exactly one row of recent colors

Browse source 
Right now one row of SvxColorValueSet is 12 colors.

Change-Id: I9be6e8487d5325866e17f578b7abb08f7c338fb1
This commit is contained in:
Maxim Monastirsky 2014-10-28 21:09:16 +02:00
parent 2c3c7529b5
commit 7ff283c6b3
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
svx/source/tbxctrls/PaletteManager.cxx
View file

@ -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),

2
svx/source/tbxctrls/colorwindow.hxx
View file

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

6
svx/source/tbxctrls/tbcontrl.cxx
View file

@ -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());