[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source

[Oliver-Rainer Wittmann]

 sc/source/ui/navipi/navipi.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit e7fa6ef1cbae2354078ec185c987e16e004e8a5d
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Tue May 21 14:36:18 2013 +0000

    122261: Calc Navigator - assure non-overlapping layout

diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 71b2767..8100212 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -56,6 +56,8 @@
 #include "navipi.hxx"
 #include "navsett.hxx"
 
+#include <algorithm>
+
 //  Timeout, um Notizen zu suchen
 #define SC_CONTENT_TIMEOUT  1000
 
@@ -700,7 +702,11 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
 
     aTitleBase = GetText();
 
-    long nListboxYPos = aTbxCmd.GetPosPixel().Y() + aTbxCmd.GetSizePixel().Height() + 4;
+    const long nListboxYPos =
+        ::std::max(
+            (aTbxCmd.GetPosPixel().Y() + aTbxCmd.GetSizePixel().Height()),
+            (aEdRow.GetPosPixel().Y() + aEdRow.GetSizePixel().Height()) )
+        + 4;
     aLbEntries.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y);
 
     nBorderOffset = aLbEntries.GetPosPixel().X();