summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-10-18 14:12:56 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-10-18 14:12:56 +0000
commita826115e9f96ebe2152c5385ea1fb77ec432a1fa (patch)
tree4eac43c8a57af45782addc18f2722f9d97bf2a90 /vcl
parentINTEGRATION: CWS c06v4_SRC680 (1.43.34.1.12); FILE MERGED (diff)
downloadcore-a826115e9f96ebe2152c5385ea1fb77ec432a1fa.tar.gz
core-a826115e9f96ebe2152c5385ea1fb77ec432a1fa.zip
INTEGRATION: CWS c06v4_SRC680 (1.207.34.1.12); FILE MERGED
2006/10/10 10:31:23 pl 1.207.34.1.12.1: #141905# do not inherit size from previous frame
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/source/window/salframe.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index 017d07ae177c..c24f799ee948 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: salframe.cxx,v $
*
- * $Revision: 1.211 $
+ * $Revision: 1.212 $
*
- * last change: $Author: obo $ $Date: 2006-10-11 08:22:47 $
+ * last change: $Author: ihi $ $Date: 2006-10-18 15:12:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -372,8 +372,6 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
const SalFrameGeometry& rGeom( pFrame->GetUnmirroredGeometry() );
x = rGeom.nX;
y = rGeom.nY;
- w = rGeom.nWidth;
- h = rGeom.nHeight;
if( x+(int)w+40 <= (int)aScreenSize.Width() &&
y+(int)h+40 <= (int)aScreenSize.Height()
)