summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/syswin.cxx21
1 files changed, 5 insertions, 16 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index cc9dd1f22bf2..cd348cff7728 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -641,14 +641,6 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
aState.mnWidth = rData.GetWidth();
aState.mnHeight = rData.GetHeight();
- if ( (aState.mnMask & SAL_FRAME_POSSIZE_X) &&
- (aState.mnMask & SAL_FRAME_POSSIZE_Y) &&
- (aState.mnMask & SAL_FRAME_POSSIZE_WIDTH) &&
- (aState.mnMask & SAL_FRAME_POSSIZE_HEIGHT) )
- {
- mbInitialLayoutDone = true;
- }
-
if( rData.GetMask() & (WINDOWSTATE_MASK_WIDTH|WINDOWSTATE_MASK_HEIGHT) )
{
// #i43799# adjust window state sizes if a minimal output size was set
@@ -1108,14 +1100,11 @@ void SystemWindow::DoInitialLayout()
if (isLayoutEnabled())
{
- if (!mbInitialLayoutDone)
- {
- mbIsCalculatingInitialLayoutSize = true;
- setDeferredProperties();
- setOptimalLayoutSize();
- mbIsCalculatingInitialLayoutSize = false;
- mbInitialLayoutDone = true;
- }
+ mbIsCalculatingInitialLayoutSize = true;
+ setDeferredProperties();
+ setOptimalLayoutSize();
+ mbIsCalculatingInitialLayoutSize = false;
+ mbInitialLayoutDone = true;
}
else if (IsDialog() && !(GetStyle() & WB_SIZEABLE))
{