summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-06-02 03:56:28 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-06-05 10:06:52 +0100
commit6d4cd686935f09756f9df7656a5b1f085f8bf89f (patch)
tree1ac9f9102d03c47f0dc9e86e32d7ba832611db34 /svx
parent442d1e1f237668ec01ca4ffd5efba87ce221b09d (diff)
sidebar: Don't overlap widgets in the .ui based panels.
Change-Id: I32c978188a38d54f2b05d40b5d47b9d5520f3cca (cherry picked from commit b441420e072a1f09098f89ed646e423c60e1895b)
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/PanelLayout.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 03ff1305570d..568f151aad7c 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -26,6 +26,10 @@ Size PanelLayout::GetOptimalSize() const
void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
{
+ Size aSize(GetOptimalSize());
+ nWidth = std::max(nWidth,aSize.Width());
+ nHeight = std::max(nHeight,aSize.Height());
+
Control::setPosSizePixel(nX, nY, nWidth, nHeight, nFlags);
if (isLayoutEnabled(this) && (nFlags & WINDOW_POSSIZE_SIZE))