[Libreoffice-commits] .: 3 commits - cui/source libcmis/StaticLibrary_cmis.mk libvisio/ExternalProject_libvisio.mk sc/source

[Libreoffice Gerrit user]

 cui/source/inc/macroass.hxx               |    2 ++
 cui/source/tabpages/macroass.cxx          |   21 ++++++++++++++++++---
 libcmis/StaticLibrary_cmis.mk             |    1 +
 libvisio/ExternalProject_libvisio.mk      |    1 +
 sc/source/filter/oox/workbookfragment.cxx |    7 ++++++-
 5 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit 29ae7be080398049644358a1044c4b253dd9e466
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 4 23:49:44 2012 +0100

    libcmis, libvisio get a boost dependency too
    
    Change-Id: I43a0e613614f98351c157895812ce3ca5808f703

diff --git a/libcmis/StaticLibrary_cmis.mk b/libcmis/StaticLibrary_cmis.mk
index 1e33865..d79f852 100644
--- a/libcmis/StaticLibrary_cmis.mk
+++ b/libcmis/StaticLibrary_cmis.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,cmislib,cmis))
 $(eval $(call gb_StaticLibrary_use_package,cmislib,libcmis_inc))
 
 $(eval $(call gb_StaticLibrary_use_externals,cmislib,\
+	boost_headers \
 	curl \
 	libxml2 \
 ))
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index 637a4a0..191a712 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libvisio,\
 ))
 
 $(eval $(call gb_ExternalProject_use_externals,libvisio,\
+	boost_headers \
 	wpd \
 	wpg \
 ))
commit d91ea14ab173619771f1ac6034610ec298b179ca
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 4 23:38:08 2012 +0100

    WorkbookFragment::finalizeImport(): catch DialogCancelledException
    
    ... so sc tests don't terminate with unhandled exception.
    
    Change-Id: Id6bcfa8b181bcb1f6df63a7918e88c68ff7940e5

diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 896f648..c5d4b30 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -28,6 +28,7 @@
 #include "oox/helper/propertyset.hxx"
 #include "oox/ole/olestorage.hxx"
 #include "vcl/msgbox.hxx"
+#include <vcl/svapp.hxx>
 
 #include "biffinputstream.hxx"
 #include "chartsheetfragment.hxx"
@@ -330,7 +331,11 @@ void WorkbookFragment::finalizeImport()
                 pDocSh->GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
                 ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS));
 
-            bHardRecalc = aBox.Execute() == RET_YES;
+            try
+            {
+                bHardRecalc = aBox.Execute() == RET_YES;
+            }
+            catch (Application::DialogCancelledException const&) {/* ignore */}
         }
 
         if (bHardRecalc)
commit 5d84af7e83404f22d3c9cd0b0bb88fb84d0550e7
Author: Michael Stahl <mstahl at redhat.com>
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...
    
    Change-Id: I01fe03abf3e4582e87927729286a21d0bac7037c

diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 8172c0d..b747742 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -67,6 +67,8 @@ public:
 
     virtual void                ScriptChanged();
     virtual void                PageCreated (SfxAllItemSet aSet);
+    using TabPage::ActivatePage; // FIXME WTF is this nonsense?
+    virtual void                ActivatePage( const SfxItemSet& );
 
     // --------- inherit from the base -------------
     virtual sal_Bool                FillItemSet( SfxItemSet& rSet );
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index f2abc5a..e91d3fb 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -64,6 +64,7 @@ public:
     sal_Bool                            bReadOnly;
     Timer                           maFillGroupTimer;
     sal_Bool                            bGotEvents;
+    bool m_bDummyActivated; ///< has this tab page already been activated
 };
 
 _SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl( void ) :
@@ -79,6 +80,7 @@ _SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl( void ) :
     pMacroStr( NULL ),
     bReadOnly( sal_False ),
     bGotEvents( sal_False )
+    , m_bDummyActivated(false)
 {
 }
 
@@ -214,6 +216,22 @@ sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
     return sal_False;
 }
 
+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;
+    }
+    else if (!mpImpl->maFillGroupTimer.GetTimeoutHdl().IsSet())
+    {
+        mpImpl->maFillGroupTimer.SetTimeoutHdl( STATIC_LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
+        mpImpl->maFillGroupTimer.SetTimeout( 0 );
+        mpImpl->maFillGroupTimer.Start();
+    }
+}
+
 void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
 {
     const SfxPoolItem* pEventsItem;
@@ -398,9 +416,6 @@ void _SfxMacroTabPage::InitAndSetHandler()
 
     mpImpl->pGroupLB->SetFunctionListBox( mpImpl->pMacroLB );
 
-    mpImpl->maFillGroupTimer.SetTimeoutHdl( STATIC_LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
-    mpImpl->maFillGroupTimer.SetTimeout( 0 );
-    mpImpl->maFillGroupTimer.Start();
 }
 
 void _SfxMacroTabPage::FillMacroList()