From ab83a1ba84502ccda07777824db07084c87a21ff Mon Sep 17 00:00:00 2001 From: Oliver-Rainer Wittmann Date: Tue, 21 May 2013 14:36:18 +0000 Subject: Resolves: #i122261# Calc Navigator - assure non-overlapping layout (cherry picked from commit e7fa6ef1cbae2354078ec185c987e16e004e8a5d) Conflicts: sc/source/ui/navipi/navipi.cxx Change-Id: I91147e2c4f5647e719eb86d0b4b342ea0d9770a7 (cherry picked from commit 94a3dc9e47afc40be21838889a326489b133c2df) --- sc/source/ui/navipi/navipi.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 5c5d7583476e..21f2178310d8 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -46,6 +46,8 @@ #include "navsett.hxx" #include "markdata.hxx" +#include + // Timeout, um Notizen zu suchen #define SC_CONTENT_TIMEOUT 1000 @@ -662,9 +664,11 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win aTitleBase = GetText(); - long nListboxYPos = - std::max( aTbxCmd.GetPosPixel().Y() + aTbxCmd.GetSizePixel().Height(), - aEdRow.GetPosPixel().Y() + aEdRow.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(); -- cgit v1.2.3