From 5ecb308bd3e8381d86f57206c0eed5f32d459956 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 7 Mar 2013 14:05:33 +0000
Subject: rename setInitialLayoutSize to setOptimalLayoutSize

and add a mechanism to know that we're in true
initial layout mode

Change-Id: I4ff61160ae67a7ccf1cb8b25c41870c195d32b94
---
 cui/source/dialogs/SpellDialog.cxx | 2 +-
 cui/source/options/fontsubs.cxx    | 3 ++-
 cui/source/options/webconninfo.cxx | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'cui/source')

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 412a0b828121..f098a287a217 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -371,7 +371,7 @@ void SpellDialog::UpdateBoxes_Impl()
     }
 
     if (bOldShowExplain != (bool) m_pExplainLink->IsVisible() || bOldShowGrammar != (bool) m_pCheckGrammarCB->IsVisible())
-        setInitialLayoutSize();
+        setOptimalLayoutSize();
 }
 // -----------------------------------------------------------------------
 
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 2f94e8b95aef..0702c99cfe43 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -410,7 +410,8 @@ void SvxFontSubstCheckListBox::setColSizes()
 void SvxFontSubstCheckListBox::Resize()
 {
     SvxSimpleTable::Resize();
-    setColSizes();
+    if (isInitialLayout(this))
+        setColSizes();
 }
 
 void SvxFontSubstCheckListBox::SetTabs()
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index eb59b4ec3b87..d56ebb8d94b8 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -28,6 +28,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/docpasswordrequest.hxx>
 #include "svtools/treelistentry.hxx"
+#include <vcl/layout.hxx>
 
 using namespace ::com::sun::star;
 
@@ -78,7 +79,8 @@ void PasswordTable::Resort( bool bForced )
 void PasswordTable::Resize()
 {
     SvxSimpleTable::Resize();
-    setColWidths();
+    if (isInitialLayout(this))
+        setColWidths();
 }
 
 void PasswordTable::setColWidths()
-- 
cgit