diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2014-09-17 10:18:12 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2014-09-17 10:20:00 +0200 |
| commit | e03223d4c3cdc5d89598f0afefbd3eaee8a69736 (patch) | |
| tree | e332e78ec7c57d4ebec215f405709af4b5ba4293 /svx | |
| parent | 83eefb378bbfc6bcdc6db9630a70c32a6ef4acc8 (diff) | |
Don't manually set the SvxColorWindow size
Change-Id: Idd5ba4480c5323fb15dbb4c850b46e3f0604737b
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/colorwindow.hxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 37ca5a89ba9c..faffc6718214 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -37,7 +37,7 @@ private: const sal_uInt16 theSlotId; SvxColorValueSet* mpColorSet; SvxColorValueSet* mpRecentColorSet; - Size maWindowSize; + ListBox* mpPaletteListBox; PushButton* mpButtonAutoColor; PushButton* mpButtonPicker; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ae02c6e892ba..1afb936d49f6 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1009,7 +1009,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, "palette_popup_window", "svx/ui/colorwindow.ui", rFrame ), theSlotId( nSlotId ), - maWindowSize( 250, 350 ), maCommand( rCommand ), mrPaletteManager( rPaletteManager ), mnColorSetCols( 10 ) @@ -1186,7 +1185,6 @@ void SvxColorWindow_Impl::Resize() { mpColorSet->SetSizePixel( this->GetOutputSizePixel() ); mpRecentColorSet->SetSizePixel( this->GetOutputSizePixel() ); - SetOutputSizePixel(maWindowSize); } void SvxColorWindow_Impl::StartSelection() |