CWS-TOOLING: integrate CWS vcl119

3 files changed, 11 insertions, 7 deletions

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index cd3e1dd0061f..34f9e5096fb1 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -857,6 +857,15 @@ void BasicFrame::Resize()
     }
 }
 
+Rectangle BasicFrame::GetInnerRect() const
+{
+    Rectangle aRect( Point(0,0), GetOutputSizePixel() );
+    aRect.Bottom() = pStatus->GetPosPixel().Y()-1;
+    if( aRect.Bottom() < 0 ) // sanity check
+        aRect.Bottom() = 0;
+    return aRect;
+}
+
 void BasicFrame::Move()
 {
     Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index 5a501ec5efcf..47dd5056fb58 100644
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -188,6 +188,7 @@ public:
     void SetAppMode( const String &aNewMode ){ aAppMode = aNewMode; UpdateTitle(); }
 
     String GenRealString( const String &aResString );
+    Rectangle GetInnerRect() const;
 
 };
 
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index 4d0a5f95fca4..eb80a96f4183 100644
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -121,14 +121,8 @@ void AppWin::Maximize()
         pFrame->nMaximizedWindows++;
         nWinState = TT_WIN_STATE_MAX;
     }
-    sal_Int32 nTitleHeight;
-    {
-        sal_Int32 nDummy1, nDummy2, nDummy3;
-        pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
-    }
 
-    Size aSize = pFrame->GetOutputSizePixel();
-    aSize.Height() -= nTitleHeight;
+    Size aSize = pFrame->GetInnerRect().GetSize();
     aSize.Height() -= 2;
     aSize.Width() -= 2;
     SetSizePixel( aSize );