[Libreoffice-commits] core.git: 3 commits - jvmfwk/source offapi/com oovbaapi/ooo scripting/source sc/source

[Caolán McNamara]

 jvmfwk/source/framework.hxx                                  |    2 +-
 offapi/com/sun/star/resource/XStringResourceWithLocation.idl |    7 +++++--
 oovbaapi/ooo/vba/excel/XRange.idl                            |    5 ++++-
 sc/source/ui/vba/vbarange.cxx                                |    2 +-
 sc/source/ui/vba/vbarange.hxx                                |    2 +-
 scripting/source/stringresource/stringresource.cxx           |    4 +++-
 scripting/source/stringresource/stringresource.hxx           |    3 ++-
 7 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit 33927ae1208766d6fdb40fdc700afbe10ca91647
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 2 15:39:46 2014 +0100

    coverity#707022 Uncaught exception
    
    Change-Id: I0585582f485399d1c21492738d26f3ef3dc9af2a

diff --git a/oovbaapi/ooo/vba/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index 7ff34dc..5211cf1 100644
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -78,7 +78,10 @@ interface XRange
     [attribute] any PageBreak;
     [attribute, readonly] XValidation Validation;
     [attribute, readonly] any PrefixCharacter;
-    [attribute] any Style;
+    [attribute] any Style
+    {
+        get raises ( com::sun::star::script::BasicErrorException );
+    };
     [attribute] any AddIndent;
     [attribute] any ShowDetail;
 
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index b5ddb21..7e33235 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -5257,7 +5257,7 @@ ScVbaRange::UnMerge(  ) throw (script::BasicErrorException, uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getStyle() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getStyle() throw (css::script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     if ( m_Areas->getCount() > 1 )
     {
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 32d1390..98c9b01 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -258,7 +258,7 @@ public:
     virtual void SAL_CALL Group(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL Merge( const css::uno::Any& Across ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL UnMerge(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL getStyle() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
commit d375986dae5a685ebd8f4d7d011d24a838608e75
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 2 15:36:28 2014 +0100

    coverity#707084 Uncaught exception
    
    Change-Id: I89459f7a77fcb5785cfb2e8288326fce65202d9c

diff --git a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
index a905cdb..3a5a215 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
@@ -22,7 +22,6 @@
 #include <com/sun/star/resource/XStringResourcePersistence.idl>
 
 
-
 module com { module sun { module star { module resource {
 
 /**
@@ -65,9 +64,13 @@ interface XStringResourceWithLocation: com::sun::star::resource::XStringResource
 
         @throws com::sun::star::lang::IllegalArgumentException
             if an empty string is passed as URL
+
+        @throws com::sun::star::lang::NoSupportException
+            if the location is readonly
     */
     void setURL( [in] string URL )
-        raises( ::com::sun::star::lang::IllegalArgumentException );
+        raises( ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::lang::NoSupportException );
 };
 
 
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 7395254..b38ddc6 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -2864,7 +2864,9 @@ void StringResourceWithLocationImpl::storeAsURL( const OUString& URL )
 }
 
 void StringResourceWithLocationImpl::setURL( const OUString& URL )
-    throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::lang::IllegalArgumentException,
+           css::lang::NoSupportException,
+           css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceWithLocationImpl::setURL(): Read only" );
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 5a74e6e..5be7acd 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -668,7 +668,8 @@ public:
     virtual void SAL_CALL storeAsURL( const OUString& URL )
         throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL setURL( const OUString& URL )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::lang::IllegalArgumentException, css::lang::NoSupportException,
+               css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
commit d1c18edd3fe5bafd9922d75e5626973197e4b78f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 2 15:30:54 2014 +0100

    coverity#707200 Uncaught exception
    
    Change-Id: Iaf115f1f11aef69ef5dba7023f4126c22d1f49ff

diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index cbb33ed..6e4fcad 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -105,7 +105,7 @@ public:
     sal_uInt64 getFeatures() const;
 };
 
-class FrameworkException
+class FrameworkException : public std::exception
 {
 public: