weld SwFrameDlg

and now can remove...

commit 5d84af7e83404f22d3c9cd0b0bb88fb84d0550e7
Date:   Tue Dec 4 22:43:46 2012 +0100

fdo#57553: Picture dialog Macro tab page: lazily init

... because JVM startup is annoying, so delay it until really activating
Macro tab.  This patch is sort of lame but with the change in
bd2c14ec78a7549d4a19738154cdd5ea890f61c4 what can you do...

and description is revealed to be a text_view not an entry

Change-Id: Ibc92cf11870d4349ddc728ec17c846e4158e82ac
Reviewed-on: https://gerrit.libreoffice.org/63916
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 3 insertions, 12 deletions

diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e1a3f9060378..4788ccc404cf 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -55,12 +55,10 @@ public:
 
     Idle                            m_aFillGroupIdle;
     bool                            m_bGotEvents;
-    bool m_bDummyActivated; ///< has this tab page already been activated
 };
 
 SfxMacroTabPage_Impl::SfxMacroTabPage_Impl()
     : m_bGotEvents(false)
-    , m_bDummyActivated(false)
 {
 }
 
@@ -189,13 +187,6 @@ void SfxMacroTabPage::LaunchFillGroup()
 
 void SfxMacroTabPage::ActivatePage( const SfxItemSet& )
 {
-    // fdo#57553 lazily init script providers, because it is annoying if done
-    // on dialog open (SfxTabDialog::Start_Impl activates all tab pages once!)
-    if (!mpImpl->m_bDummyActivated)
-    {
-        mpImpl->m_bDummyActivated = true;
-        return;
-    }
     LaunchFillGroup();
 }
 
@@ -396,15 +387,15 @@ void SfxMacroTabPage::FillEvents()
 
 namespace
 {
-    VclPtr<SfxMacroTabPage> CreateSfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rAttrSet )
+    VclPtr<SfxMacroTabPage> CreateSfxMacroTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet)
     {
         return VclPtr<SfxMacroTabPage>::Create( pParent, nullptr, rAttrSet );
     }
 }
 
-VclPtr<SfxTabPage> SfxMacroTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SfxMacroTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
 {
-    return CreateSfxMacroTabPage(pParent.pParent, *rAttrSet);
+    return CreateSfxMacroTabPage(pParent, *rAttrSet);
 }
 
 SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent,