[Libreoffice-commits] .: 2 commits - cppuhelper/source officecfg/registry

[Libreoffice Gerrit user]

 cppuhelper/source/propertysetmixin.cxx           |    7 ++++++-
 officecfg/registry/data/org/openoffice/Setup.xcu |    2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit a28b4c1e3e5855c208c9d940de8e922de33eb129
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Nov 29 15:54:30 2012 +0100

    Do not override the message of an underlying PropertyVetoException
    
    Change-Id: I9c1026ad87f3031f1c56066ab24d23d3a6d8782b
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index babad63..c3c30fb 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -625,7 +625,12 @@ void PropertySetMixinImpl::Impl::setProperty(
                         & css::beans::PropertyAttribute::CONSTRAINED)
                        != 0))
         {
-            throw css::beans::PropertyVetoException("Invalid " + name, object);
+            css::beans::PropertyVetoException exc;
+            e.TargetException >>= exc;
+            if (exc.Message.isEmpty() )
+                throw css::beans::PropertyVetoException("Invalid " + name, object);
+            else
+                throw exc;
         } else {
             throw css::lang::WrappedTargetException(
                 e.Message, object, e.TargetException);
commit 1c1d3b6727af2b937d83cc63a94b00f51bb0dff8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 30 10:38:43 2012 +0100

    Do not migrate old (per-user/shared) script provider extensions
    
    ... for BeanShell and Javascript, which have been changed from bundled extensions to plain
    code parts a while ago already; but just in case...
    
    Change-Id: I92f25a9607f8cdf7ec6c90ee615281317d1ec6e4

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index da0c62e..c1fa23f 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -798,6 +798,8 @@
                     <!-- arguably, dropping PDFImport extensions should be
                          conditional on having in-core PDF import actually built
                          and installed -->
+                <it>com.sun.star.script.provider.ScriptProviderForBeanShell</it>
+                <it>com.sun.star.script.provider.ScriptProviderForJavaScript</it>
                 <it>com.sun.star.script.provider.ScriptProviderForPython</it>
               </value>
             </prop>