diff options
| -rw-r--r-- | vcl/source/window/menu.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 0fff3c32daf0..3b4ac0d693e2 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -875,15 +875,18 @@ static int ImplGetTopDockingAreaHeight( Window *pWindow ) if ( pChildWin->GetType() == WINDOW_DOCKINGAREA ) pDockingArea = static_cast< DockingAreaWindow* >( pChildWin ); - if( pDockingArea && pDockingArea->GetAlign() == WINDOWALIGN_TOP && pDockingArea->IsVisible() ) + if( pDockingArea && pDockingArea->GetAlign() == WINDOWALIGN_TOP && + pDockingArea->IsVisible() && pDockingArea->GetOutputSizePixel().Height() != 0 ) + { return pDockingArea->GetOutputSizePixel().Height(); - else - pChildWin = pChildWin->GetWindow( WINDOW_NEXT ); //mpWindowImpl->mpNext; + } + + pChildWin = pChildWin->GetWindow( WINDOW_NEXT ); //mpWindowImpl->mpNext; } } - else - pWin = pWin->GetWindow( WINDOW_NEXT ); //mpWindowImpl->mpNext; + + pWin = pWin->GetWindow( WINDOW_NEXT ); //mpWindowImpl->mpNext; } } return 0; |