[Libreoffice-commits] core.git: 2 commits - cli_ure/Executable_climaker.mk desktop/source

[Stephan Bergmann]

 cli_ure/Executable_climaker.mk                               |    3 +++
 desktop/source/deployment/manager/dp_informationprovider.cxx |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 123189c882366002ca4c81c7db71ed690f8e907e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 22 16:26:50 2013 +0200

    No use continuing with empty extensions sequence past the exception here
    
    Change-Id: I889c7d526b0b06b3c77248d1da255ffa8f754da1

diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index d6846de..bae1ef4 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -224,8 +224,11 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
             extensions = extMgr->getExtensionsWithSameIdentifier(
                 dp_misc::getIdentifier(info.extension), info.extension->getName(),
                 uno::Reference<css_ucb::XCommandEnvironment>());
-        } catch (lang::IllegalArgumentException& ) {
-            OSL_ASSERT(0);
+        } catch (lang::IllegalArgumentException& e) {
+            SAL_WARN(
+                "desktop.deployment",
+                "ignoring IllegalArgumentException \"" << e.Message << "\"");
+            continue;
         }
         OSL_ASSERT(extensions.getLength() == 3);
         if (extensions[0].is() )
commit fc456b51fc7543d88585f0b18e3856675ba9c3b1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 22 16:25:27 2013 +0200

    Missing dependency (see "#using <cli_basetypes.dll>" in climaker_share.h)
    
    Change-Id: I2575da1ccbe1c301dd826588aec2a787176d3cfd

diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk
index 2c30b5c..db7e42c 100644
--- a/cli_ure/Executable_climaker.mk
+++ b/cli_ure/Executable_climaker.mk
@@ -44,4 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,climaker,\
 	cli_ure/source/climaker/climaker_emit \
 ))
 
+$(call gb_Executable_get_headers_target,climaker) : \
+    $(call gb_CliLibrary_get_target,cli_basetypes)
+
 # vim: set noet sw=4 ts=4: