diff options
| author | Mathias Bauer <mba@openoffice.org> | 2002-10-11 17:08:29 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2002-10-11 17:08:29 +0000 |
| commit | 862edf6d7f50387b72ad8e66d03709bf5f2dfcb8 (patch) | |
| tree | 28babb0b649d5326ed90f893dadc7c46cb7999d2 /framework/source/helper/persistentwindowstate.cxx | |
| parent | ef05a7ac4f15c5deddf06f56741a1e672fbdb049 (diff) | |
#94144#: care for minimized in window state
Diffstat (limited to 'framework/source/helper/persistentwindowstate.cxx')
| -rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 7fda1c5664..8c2f7ed72e 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: persistentwindowstate.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: as $ $Date: 2002-07-29 08:18:00 $ + * last change: $Author: mba $ $Date: 2002-10-11 18:08:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -135,6 +135,7 @@ #include <vcl/svapp.hxx> #endif +#include <vcl/wrkwin.hxx> //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ @@ -548,7 +549,12 @@ sal_Bool PersistentWindowState::implst_getFrameProps( const css::uno::Reference< Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); // check for system window is neccessary to guarantee correct pointer cast! if (pWindow!=NULL && pWindow->IsSystemWindow()) - sWindowState = ((SystemWindow*)pWindow)->GetWindowState(); + { + ULONG nMask = WINDOWSTATE_MASK_ALL; + nMask &= ~(WINDOWSTATE_STATE_MINIMIZED); + sWindowState = ((SystemWindow*)pWindow)->GetWindowState( nMask ); + } + aSolarGuard.clear(); /* } SOLAR SAFE */ @@ -566,7 +572,7 @@ void PersistentWindowState::implst_setWindowState( const css::uno::Reference< cs ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); // check for system window is neccessary to guarantee correct pointer cast! - if (pWindow!=NULL && pWindow->IsSystemWindow()) + if ( pWindow!=NULL && pWindow->IsSystemWindow() && (pWindow->GetType() != WINDOW_WORKWINDOW || !((WorkWindow*)pWindow)->IsMinimized() ) ) ((SystemWindow*)pWindow)->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8)); aSolarGuard.clear(); /* } SOLAR SAFE */ |