#94144# enable minimize window state again

2 files changed, 15 insertions, 10 deletions

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 355da6e92ead..a8ea885e14b6 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: syswin.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: ssa $ $Date: 2002-05-23 09:43:15 $
+ *  last change: $Author: ssa $ $Date: 2002-10-11 08:38:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -529,9 +529,10 @@ static void ImplWindowStateFromStr( WindowStateData& rData, const ByteString& rS
     aTokenStr = rStr.GetToken( 0, ';', nIndex );
     if ( aTokenStr.Len() )
     {
+        // #94144# allow Minimize again, should be masked out when read from configuration
         // 91625 - ignore Minimize
         ULONG nState = (ULONG)aTokenStr.ToInt32();
-        nState &= ~(WINDOWSTATE_STATE_MINIMIZED);
+        //nState &= ~(WINDOWSTATE_STATE_MINIMIZED);
         rData.SetState( nState );
         nValidMask |= WINDOWSTATE_MASK_STATE;
     }
@@ -562,9 +563,10 @@ static void ImplWindowStateToStr( const WindowStateData& rData, ByteString& rStr
     rStr.Append( ';' );
     if ( nValidMask & WINDOWSTATE_MASK_STATE )
     {
+        // #94144# allow Minimize again, should be masked out when read from configuration
         // 91625 - ignore Minimize
         ULONG nState = rData.GetState();
-        nState &= ~(WINDOWSTATE_STATE_MINIMIZED);
+        //nState &= ~(WINDOWSTATE_STATE_MINIMIZED);
         rStr.Append( ByteString::CreateFromInt32( (long)nState ) );
     }
     rStr.Append( ';' );
@@ -595,8 +597,9 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
         aState.mnY      = rData.GetY();
         aState.mnWidth  = rData.GetWidth();
         aState.mnHeight = rData.GetHeight();
+        // #94144# allow Minimize again, should be masked out when read from configuration
         // 91625 - ignore Minimize
-        nState &= ~(WINDOWSTATE_STATE_MINIMIZED);
+        //nState &= ~(WINDOWSTATE_STATE_MINIMIZED);
         aState.mnState  = nState & SAL_FRAMESTATE_SYSTEMMASK;
         mpFrame->SetWindowState( &aState );
 #else
@@ -687,8 +690,9 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
                 rData.SetHeight( aState.mnHeight );
             if ( nValidMask & WINDOWSTATE_MASK_STATE )
             {
+                // #94144# allow Minimize again, should be masked out when read from configuration
                 // 91625 - ignore Minimize
-                aState.mnState &= ~(WINDOWSTATE_STATE_MINIMIZED);
+                //aState.mnState &= ~(WINDOWSTATE_STATE_MINIMIZED);
                 rData.SetState( aState.mnState );
             }
         }
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 8a92bbf0e4dc..f4e0a0ce1f5c 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salframe.cxx,v $
  *
- *  $Revision: 1.66 $
+ *  $Revision: 1.67 $
  *
- *  last change: $Author: ssa $ $Date: 2002-10-09 13:48:33 $
+ *  last change: $Author: ssa $ $Date: 2002-10-11 08:39:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1633,9 +1633,10 @@ BOOL SalFrame::GetWindowState( SalFrameState* pState )
     if ( maFrameData.maState.mnWidth && maFrameData.maState.mnHeight )
     {
         *pState = maFrameData.maState;
+        // #94144# allow Minimize again, should be masked out when read from configuration
         // 91625 - Don't save minimize
-        // if ( !(pState->mnState & (SAL_FRAMESTATE_MINIMIZED | SAL_FRAMESTATE_MAXIMIZED)) )
-        if ( !(pState->mnState & SAL_FRAMESTATE_MAXIMIZED) )
+        //if ( !(pState->mnState & SAL_FRAMESTATE_MAXIMIZED) )
+        if ( !(pState->mnState & (SAL_FRAMESTATE_MINIMIZED | SAL_FRAMESTATE_MAXIMIZED)) )
             pState->mnState |= SAL_FRAMESTATE_NORMAL;
         return TRUE;
     }