force all tabs to exist when layout enabled

1 files changed, 16 insertions, 0 deletions

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d820173e783b..e4df68bfb518 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -667,6 +667,22 @@ 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())
+    {
+        for ( sal_uInt16 n=0; n < aTabCtrl.GetPageCount(); ++n)
+        {
+            sal_uInt16 nPageId = aTabCtrl.GetPageId(n);
+            TabPage* pTabPage = aTabCtrl.GetTabPage(nPageId);
+            if (!pTabPage)
+            {
+                aTabCtrl.SetCurPageId(nPageId);
+                ActivatePageHdl(&aTabCtrl);
+            }
+        }
+    }
+
     DBG_ASSERT( pImpl->pData->Count() == aTabCtrl.GetPageCount(), "not all pages registered" );
     sal_uInt16 nActPage = aTabCtrl.GetPageId( 0 );