[Libreoffice-commits] .: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/dialog/tabdlg.cxx |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

New commits:
commit bd2c14ec78a7549d4a19738154cdd5ea890f61c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 30 12:00:01 2012 +0000

    we have to have all tabpages in all modes now
    
    Change-Id: I05a587d4b0556cb9eda49583441b3f57d923a800

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index b137cee..eda2375 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -727,19 +727,14 @@ sal_Bool SfxTabDialog::IsApplyButtonEnabled() const
 
 void SfxTabDialog::Start_Impl()
 {
-    //If we're layout enabled, we need to force all tabs to
-    //exist to get overall optimal size for dialog
-    if (isLayoutEnabled())
+    //We need to force all tabs to exist to get overall optimal size for dialog
+    for (sal_uInt16 n=0; n < m_pTabCtrl->GetPageCount(); ++n)
     {
-        for ( sal_uInt16 n=0; n < m_pTabCtrl->GetPageCount(); ++n)
+        sal_uInt16 nPageId = m_pTabCtrl->GetPageId(n);
+        if (!m_pTabCtrl->GetTabPage(nPageId))
         {
-            sal_uInt16 nPageId = m_pTabCtrl->GetPageId(n);
-            TabPage* pTabPage = m_pTabCtrl->GetTabPage(nPageId);
-            if (!pTabPage)
-            {
-                m_pTabCtrl->SetCurPageId(nPageId);
-                ActivatePageHdl(m_pTabCtrl);
-            }
+            m_pTabCtrl->SetCurPageId(nPageId);
+            ActivatePageHdl(m_pTabCtrl);
         }
     }