we only ever want the preferred window size from GetOptimalSize

so remove the MAX and MIN options and simplify the whole lot

Change-Id: Iaaf350c37e01f7fce434af760bcddb9b7d7135ea

8 files changed, 16 insertions, 34 deletions

diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
index 278ef349155c..0b534f88ed9b 100644
--- a/svtools/inc/svtools/toolpanel/paneltabbar.hxx
+++ b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
@@ -65,7 +65,7 @@ namespace svt
         PushButton&                 GetScrollButton( const bool i_bForward );
 
         // Window overridables
-        virtual Size    GetOptimalSize( WindowSizeType i_eType ) const;
+        virtual Size    GetOptimalSize() const;
 
     protected:
         // Window overridables
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index ba678aeb9186..c448c78e3463 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -762,7 +762,7 @@ public:
 
     long getPreferredDimensions(std::vector<long> &rWidths) const;
 
-    virtual Size GetOptimalSize(WindowSizeType i_eType) const;
+    virtual Size GetOptimalSize() const;
 };
 
 #define SV_LBOX_DD_FORMAT "SV_LBOX_DD_FORMAT"
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index b6c9613f79ca..eddb6022534e 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3408,24 +3408,12 @@ long SvTreeListBox::getPreferredDimensions(std::vector<long> &rWidths) const
     return nHeight;
 }
 
-Size SvTreeListBox::GetOptimalSize(WindowSizeType eType) const
+Size SvTreeListBox::GetOptimalSize() const
 {
-    Size aRet;
-    switch (eType)
-    {
-        case WINDOWSIZE_MINIMUM:
-        case WINDOWSIZE_PREFERRED:
-        {
-            std::vector<long> aWidths;
-            aRet.Height() = getPreferredDimensions(aWidths);
-            for (size_t i = 0; i < aWidths.size(); ++i)
-                aRet.Width() += aWidths[i];
-            break;
-        }
-        default:
-            aRet = Control::GetOptimalSize(eType);
-            break;
-    }
+    std::vector<long> aWidths;
+    Size aRet(0, getPreferredDimensions(aWidths));
+    for (size_t i = 0; i < aWidths.size(); ++i)
+        aRet.Width() += aWidths[i];
     return aRet;
 }
 
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index ca391d440ed7..55e208d7c5e8 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -197,7 +197,7 @@ IMPL_LINK( PlaceEditDialog, SelectTypeHdl, void*, EMPTYARG )
 
     m_pCurrentDetails->show( true );
 
-    SetSizePixel( GetOptimalSize( WINDOWSIZE_MINIMUM ) );
+    SetSizePixel(GetOptimalSize());
     return 0;
 }
 
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index d1dd6eeb20f1..1c08d59d303d 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -1020,10 +1020,10 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    Size PanelTabBar::GetOptimalSize( WindowSizeType i_eType ) const
+    Size PanelTabBar::GetOptimalSize() const
     {
         m_pImpl->EnsureItemsCache();
-        Size aOptimalSize( m_pImpl->m_aGeometry.getOptimalSize( m_pImpl->m_aItems, i_eType == WINDOWSIZE_MINIMUM ) );
+        Size aOptimalSize(m_pImpl->m_aGeometry.getOptimalSize(m_pImpl->m_aItems));
         if ( m_pImpl->IsVertical() )
             ::std::swap( aOptimalSize.Width(), aOptimalSize.Height() );
         return aOptimalSize;
diff --git a/svtools/source/toolpanel/tabbargeometry.cxx b/svtools/source/toolpanel/tabbargeometry.cxx
index 97b29002d6ce..0eb4fddd1b12 100644
--- a/svtools/source/toolpanel/tabbargeometry.cxx
+++ b/svtools/source/toolpanel/tabbargeometry.cxx
@@ -256,7 +256,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    Size TabBarGeometry::getOptimalSize( ItemDescriptors& io_rItems, const bool i_bMinimalSize ) const
+    Size TabBarGeometry::getOptimalSize(ItemDescriptors& io_rItems) const
     {
         if ( io_rItems.empty() )
             return Size(
@@ -265,7 +265,7 @@ namespace svt
             );
 
         // the rect of the last item
-        const Rectangle& rLastItemRect( i_bMinimalSize ? io_rItems.rbegin()->aIconOnlyArea : io_rItems.rbegin()->aCompleteArea );
+        const Rectangle& rLastItemRect(io_rItems.rbegin()->aCompleteArea);
         return Size(
                     rLastItemRect.Left() + 1 + m_aItemsInset.Right(),
                     rLastItemRect.Top() + 1 + rLastItemRect.Bottom() + m_aItemsInset.Bottom()
diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx
index 04390234f9be..38750a1f55f5 100644
--- a/svtools/source/toolpanel/tabbargeometry.hxx
+++ b/svtools/source/toolpanel/tabbargeometry.hxx
@@ -100,7 +100,7 @@ namespace svt
 
         /** calculates the optimal size of the tab bar, depending on the item's sizes
         */
-        Size    getOptimalSize( ItemDescriptors& io_rItems, const bool i_bMinimalSize ) const;
+        Size    getOptimalSize(ItemDescriptors& io_rItems) const;
 
         /** retrieves the position where the first item should start, relative to the item rect
         */
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index 8c445313d105..bd38da4e4592 100644
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -124,13 +124,10 @@ namespace svt
         if ( lcl_checkDisposed( *m_pData ) )
             return i_rDeckPlayground;
 
-        const Size aPreferredSize( m_pData->pTabBar->GetOptimalSize( WINDOWSIZE_PREFERRED ) );
+        const Size aPreferredSize(m_pData->pTabBar->GetOptimalSize());
         if ( lcl_isVerticalTabBar( m_pData->eAlignment ) )
         {
-            Size aTabBarSize =  ( aPreferredSize.Width() < i_rDeckPlayground.GetWidth() )
-                            ?   aPreferredSize
-                            :   m_pData->pTabBar->GetOptimalSize( WINDOWSIZE_MINIMUM );
-            aTabBarSize.Height() = i_rDeckPlayground.GetHeight();
+            Size aTabBarSize(aPreferredSize.Width(), i_rDeckPlayground.GetHeight());
 
             Rectangle aPanelRect( i_rDeckPlayground );
             if ( m_pData->eAlignment == TABS_RIGHT )
@@ -151,10 +148,7 @@ namespace svt
             return aPanelRect;
         }
 
-        Size aTabBarSize =  ( aPreferredSize.Height() < i_rDeckPlayground.GetHeight() )
-                        ?   aPreferredSize
-                        :   m_pData->pTabBar->GetOptimalSize( WINDOWSIZE_MINIMUM );
-        aTabBarSize.Width() = i_rDeckPlayground.GetWidth();
+        Size aTabBarSize(i_rDeckPlayground.GetWidth(), aPreferredSize.Height());
 
         Rectangle aPanelRect( i_rDeckPlayground );
         if ( m_pData->eAlignment == TABS_TOP )