[Libreoffice-commits] core.git: desktop/source sw/qa

[Stephan Bergmann]

 desktop/source/deployment/manager/dp_extensionmanager.cxx |    2 +-
 desktop/source/deployment/manager/dp_extensionmanager.hxx |    2 +-
 sw/qa/python/var_fields.py                                |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b993c5591e965de3b9e95e32007ea4231b2997d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 29 10:44:59 2013 +0200

    RuntimeException missing from exception specification for UNO method
    
    ...which lead to std::unoexpected from sw/PythonTest_sw_python.
    
    Change-Id: I94bdbbe131a7c65c363f7aa66e8d8df7bd531449

diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index ef539bc..55d9802 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -212,7 +212,7 @@ Reference<task::XAbortChannel> ExtensionManager::createAbortChannel()
 
 css::uno::Reference<css::deployment::XPackageManager>
 ExtensionManager::getPackageManager(OUString const & repository)
-    throw (css::lang::IllegalArgumentException)
+    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 {
     Reference<deploy::XPackageManager> xPackageManager;
     if (repository == "user")
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index db11f12..b23bf90 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -277,7 +277,7 @@ private:
 
     css::uno::Reference<css::deployment::XPackageManager>
     getPackageManager(OUString const & repository)
-        throw (css::lang::IllegalArgumentException);
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     bool doChecksForAddExtension(
         css::uno::Reference<css::deployment::XPackageManager> const & xPackageMgr,
diff --git a/sw/qa/python/var_fields.py b/sw/qa/python/var_fields.py
index 4924636..92f2da1 100644
--- a/sw/qa/python/var_fields.py
+++ b/sw/qa/python/var_fields.py
@@ -113,7 +113,7 @@ class TestVarFields(unittest.TestCase):
         xDoc.refresh()
         # 18. store document
         url = os.path.join(os.environ["TestUserDir"], "VarFields.odt")
-        #xDoc.storeToURL(url, tuple(list(range(0))))
+        xDoc.storeToURL(url, tuple(list(range(0))))
         # 19. retrieve the section
         xPropSet = xDoc.getTextSections().getByIndex(0)
         # 20. retrieve the condition property of that section