diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2009-12-11 13:49:58 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2009-12-11 13:49:58 +0100 |
| commit | af24b66c7b07b21e0ef5268116d75e6c22b95c90 (patch) | |
| tree | 4826d7b88f8368a29e17df24cd1cfabea56dc43b /vcl/source/window | |
| parent | 0d1debd8e0179006d80f7f9ca443d21730f14dae (diff) | |
| parent | f8ada8f2a93659e27928f3b5244c813de2c3847b (diff) | |
merge with DEV300m67
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/status.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/wrkwin.cxx | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index a4c067061c30..8d986f691963 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -1321,8 +1321,13 @@ void StatusBar::SetItemText( USHORT nItemId, const XubString& rText ) // adjust item width - see also DataChanged() long nFudge = GetTextHeight()/4; long nWidth = GetTextWidth( pItem->maText ) + nFudge; - if( nWidth > pItem->mnWidth + STATUSBAR_OFFSET ) + if( (nWidth > pItem->mnWidth + STATUSBAR_OFFSET) || + ((nWidth < pItem->mnWidth) && (mnDX - STATUSBAR_OFFSET) < mnItemsWidth )) + { pItem->mnWidth = nWidth + STATUSBAR_OFFSET; + ImplFormat(); + Invalidate(); + } // Item neu Zeichen, wenn StatusBar sichtbar und // UpdateMode gesetzt ist diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d2683f918931..04846c535f26 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -9755,6 +9755,8 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP EnableOutput(); DBG_ASSERT( GetMapMode().GetMapUnit() == MAP_PIXEL, "MapMode must be PIXEL based" ); + if ( GetMapMode().GetMapUnit() != MAP_PIXEL ) + return; // preserve graphicsstate Push(); diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 0c19c5c5ee4f..c1f80bb061e5 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -310,7 +310,7 @@ void WorkWindow::Maximize( BOOL bMaximize ) ImplSetFrameState( bMaximize ? SAL_FRAMESTATE_MAXIMIZED : SAL_FRAMESTATE_NORMAL ); } -BOOL WorkWindow::IsMaximized() +BOOL WorkWindow::IsMaximized() const { BOOL bRet = FALSE; |