You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/05/21 16:36:18 UTC
svn commit: r1484819 - /openoffice/trunk/main/sc/source/ui/navipi/navipi.cxx
Author: orw
Date: Tue May 21 14:36:18 2013
New Revision: 1484819
URL: http://svn.apache.org/r1484819
Log:
122261: Calc Navigator - assure non-overlapping layout
Modified:
openoffice/trunk/main/sc/source/ui/navipi/navipi.cxx
Modified: openoffice/trunk/main/sc/source/ui/navipi/navipi.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/navipi/navipi.cxx?rev=1484819&r1=1484818&r2=1484819&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/navipi/navipi.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/navipi/navipi.cxx Tue May 21 14:36:18 2013
@@ -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( SfxBindi
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();