[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 2 commits - offapi/com Repository.mk smoketest/Executable_libtest.mk vbahelper/source

[Michael Meeks]

 Repository.mk                                         |    1 
 offapi/com/sun/star/script/vba/XVBAEventProcessor.idl |    5 ----
 smoketest/Executable_libtest.mk                       |    5 +++-
 vbahelper/source/vbahelper/vbaeventshelperbase.cxx    |   19 +++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit b657d6f6f95962573ac8d31afc623b51c63cbee1
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Nov 11 17:07:35 2013 +0000

    Accelerate checking for VBA macros that are not there.

diff --git a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
index 750cc4d..1fbf75d 100644
--- a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
@@ -44,10 +44,7 @@ interface XVBAEventProcessor
 
         @return
             `TRUE`, if the VBA event handler exists.
-
-        @throws ::com::sun::star::lang::IllegalArgumentException
-            if the passed event identifier is not supported, or if the passed
-            specifier is required but invalid.
+            `FALSE`, for all other cases.
     **/
     boolean hasVbaEventHandler( [in] long nEventId, [in] sequence< any > aArgs )
         raises (::com::sun::star::lang::IllegalArgumentException);
diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
index b6a7e7a..69b5584 100644
--- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
+++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
@@ -51,15 +51,6 @@ VbaEventsHelperBase::~VbaEventsHelperBase()
     SAL_WARN_IF( !mbDisposed, "vbahelper", "VbaEventsHelperBase::~VbaEventsHelperBase - missing disposing notification" );
 }
 
-sal_Bool SAL_CALL VbaEventsHelperBase::hasVbaEventHandler( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs )
-        throw (lang::IllegalArgumentException, uno::RuntimeException)
-{
-    // getEventHandlerInfo() throws, if unknown event dentifier has been passed
-    const EventHandlerInfo& rInfo = getEventHandlerInfo( nEventId );
-    // getEventHandlerPath() searches for the macro in the document
-    return !getEventHandlerPath( rInfo, rArgs ).isEmpty();
-}
-
 sal_Bool SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs )
         throw (lang::IllegalArgumentException, util::VetoException, uno::RuntimeException)
 {
@@ -241,6 +232,16 @@ void VbaEventsHelperBase::stopListening()
     mbDisposed = true;
 }
 
+sal_Bool SAL_CALL VbaEventsHelperBase::hasVbaEventHandler( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs )
+        throw (lang::IllegalArgumentException, uno::RuntimeException)
+{
+    EventHandlerInfoMap::const_iterator aIt = maEventInfos.find( nEventId );
+    if( aIt == maEventInfos.end() )
+        return sal_False; // throwing a lot of exceptions is slow.
+    else // getEventHandlerPath() searches for the macro in the document
+        return !getEventHandlerPath( aIt->second, rArgs ).isEmpty();
+}
+
 const VbaEventsHelperBase::EventHandlerInfo& VbaEventsHelperBase::getEventHandlerInfo(
         sal_Int32 nEventId ) const throw (lang::IllegalArgumentException)
 {
commit dce7f1be6bf2bd711f4303b9380d38c258f30673
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Nov 7 14:21:40 2013 +0000

    liblibo: fix static library linkage.
    
    Change-Id: Ic6b69b322c819ff07d55e3b452dadafc60041e1d

diff --git a/Repository.mk b/Repository.mk
index c5bec39..9b688ac 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -562,7 +562,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	) \
 ))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	libreoffice \
 	pyuno \
 	pyuno_wrapper \
 	recentfile \
diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk
index 3d8ec63..9f965b6 100644
--- a/smoketest/Executable_libtest.mk
+++ b/smoketest/Executable_libtest.mk
@@ -15,10 +15,13 @@ $(eval $(call gb_Executable_set_include,libtest,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,libtest,\
-	libreoffice \
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Executable_use_static_libraries,libtest,\
+	libreoffice \
+))
+
 $(eval $(call gb_Executable_add_libs,libtest,\
 	-ldl \
 	-pthread \