diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-10 09:29:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-10 11:21:03 +0000 |
commit | 2b12a5b87b1de9ae95d9562ba21201890b1100c5 (patch) | |
tree | ae0c1b5064c4d92e65db301e4d8acd87e891b159 /sd | |
parent | a95b58060b01046a8881e97e0c5016e44200dd32 (diff) |
the return of callcatcher
Change-Id: I447ebcc61ff061bce15678c6fcfd3d0a4669908f
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 57 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.hxx | 4 |
2 files changed, 0 insertions, 61 deletions
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 62289b76d6af..1733a1051626 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -251,48 +251,6 @@ AutoLayout LayoutMenu::GetSelectedAutoLayout (void) return aResult; } - - - -/** The preferred size depends on the preferred number of columns, the - number of items, and the size of the items. -*/ -Size LayoutMenu::GetPreferredSize (void) -{ - Size aItemSize = CalcItemSizePixel (Size()); - Size aPreferredWindowSize = CalcWindowSizePixel ( - aItemSize, - (sal_uInt16)mnPreferredColumnCount, - (sal_uInt16)CalculateRowCount (aItemSize,mnPreferredColumnCount)); - return aPreferredWindowSize; -} - - - - -sal_Int32 LayoutMenu::GetPreferredWidth (sal_Int32 nHeight) -{ - sal_Int32 nPreferredWidth = 100; - if (GetItemCount() > 0) - { - Image aImage = GetItemImage(GetItemId(0)); - Size aItemSize = CalcItemSizePixel (aImage.GetSizePixel()); - if (nHeight>0 && aItemSize.Height()>0) - { - int nRowCount = nHeight / aItemSize.Height(); - if (nRowCount <= 0) - nRowCount = 1; - int nColumnCount = (GetItemCount() + nRowCount-1) / nRowCount; - nPreferredWidth = nColumnCount * aItemSize.Width(); - } - } - - return nPreferredWidth; -} - - - - ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth) { sal_Int32 nPreferredHeight = 200; @@ -319,21 +277,6 @@ ui::LayoutSize LayoutMenu::GetHeightForWidth (const sal_Int32 nWidth) -sal_Int32 LayoutMenu::GetMinimumWidth (void) -{ - sal_Int32 nMinimumWidth = 0; - if (GetItemCount()>0) - { - Image aImage = GetItemImage(GetItemId(0)); - Size aItemSize = CalcItemSizePixel (aImage.GetSizePixel()); - nMinimumWidth = aItemSize.Width(); - } - return nMinimumWidth; -} - - - - void LayoutMenu::Paint (const Rectangle& rRect) { if (mbSelectionUpdatePending) diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index a858101ba692..88cfa527f2ab 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -85,10 +85,6 @@ public: */ AutoLayout GetSelectedAutoLayout (void); - Size GetPreferredSize (void); - sal_Int32 GetPreferredWidth (sal_Int32 nHeight); - sal_Int32 GetMinimumWidth (void); - // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth); |