From e03223d4c3cdc5d89598f0afefbd3eaee8a69736 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Wed, 17 Sep 2014 10:18:12 +0200
Subject: Don't manually set the SvxColorWindow size

Change-Id: Idd5ba4480c5323fb15dbb4c850b46e3f0604737b
---
 svx/source/tbxctrls/colorwindow.hxx | 2 +-
 svx/source/tbxctrls/tbcontrl.cxx    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'svx')

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()
-- 
cgit