diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-05-21 14:36:18 +0000 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <orw@apache.org> | 2013-05-21 14:36:18 +0000 |
| commit | e7fa6ef1cbae2354078ec185c987e16e004e8a5d (patch) | |
| tree | 0bfb92630ac53d95e9442351b54c5dc7a84ebfa4 /sc/source | |
| parent | 1aead9f230e3953f6049e1700d912d6c14c62e7f (diff) | |
122261: Calc Navigator - assure non-overlapping layout
Notes
Notes:
merged as: 94a3dc9e47afc40be21838889a326489b133c2df
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/navipi/navipi.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 71b2767f0b19..8100212193a1 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(); |