[Libreoffice-commits] core.git: 8 commits - sfx2/source sw/source ucb/source

Caolán McNamara caolanm at redhat.com
Sat Jun 27 11:28:24 PDT 2015


 sfx2/source/appl/shutdownicon.cxx             |    2 +-
 sfx2/source/appl/shutdownicon.hxx             |    2 +-
 sw/source/core/unocore/unoobj.cxx             |    2 +-
 sw/source/core/unocore/unostyle.cxx           |    2 +-
 sw/source/core/unocore/unotext.cxx            |    4 ++--
 sw/source/ui/vba/vbaview.cxx                  |    2 +-
 sw/source/ui/vba/vbaview.hxx                  |    2 +-
 ucb/source/ucp/hierarchy/hierarchycontent.cxx |    4 ++--
 ucb/source/ucp/hierarchy/hierarchycontent.hxx |    4 ++--
 ucb/source/ucp/tdoc/tdoc_content.cxx          |    2 +-
 ucb/source/ucp/tdoc/tdoc_content.hxx          |    2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit ec44f1ae39e44f55ef1b1625fc5f638d2dbf5256
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 27 18:59:15 2015 +0100

    coverity#1308479 Uncaught exception
    
    Change-Id: I1ead142b0459c87efb2b09e602553b79d2bd6b26

diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index b434927..44dffe6 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1585,7 +1585,7 @@ void HierarchyContent::destroy( bool bDeletePhysical,
 void HierarchyContent::transfer(
             const ucb::TransferInfo& rInfo,
             const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception )
+    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 47e5ff2..876e944 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -212,7 +212,7 @@ private:
     void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo,
                    const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
-        throw( ::com::sun::star::uno::Exception );
+        throw( ::com::sun::star::uno::Exception, std::exception );
 
 public:
     // Create existing content. Fail, if not already exists.
commit 8c8ad6af032c40be90e02fcf8b87320ed0aae069
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 27 18:58:37 2015 +0100

    coverity#1308478 Uncaught exception
    
    Change-Id: Ifce0dccd4bb93dd1d8ed2a551d35ff0fd89d3e6c

diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 8a6c40f..31cc981 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2311,7 +2311,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                         SwStyleBase_Impl& rBase,
                         SfxStyleSheetBase* pBase,
                         SfxStyleFamily eFamily,
-                        SwDoc *pDoc) throw(uno::RuntimeException)
+                        SwDoc *pDoc) throw(uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
 
commit e9508813990e66ee971579ef98b53999ffc598cd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 27 18:58:04 2015 +0100

    coverity#1308477 Uncaught exception
    
    Change-Id: Ib4761a650c682646961c3ee6e7af266269df31ef

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 8baa445..f012628 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -99,7 +99,7 @@ public:
             const uno::Sequence< beans::PropertyValue >&
                 rCharacterAndParagraphProperties,
             const uno::Reference< text::XTextRange >& xInsertPosition)
-        throw (lang::IllegalArgumentException, uno::RuntimeException);
+        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception);
 
     sal_Int16 ComparePositions(
             const uno::Reference<text::XTextRange>& xPos1,
@@ -1258,7 +1258,7 @@ SwXText::Impl::finishOrAppendParagraph(
         const bool bFinish,
         const uno::Sequence< beans::PropertyValue > & rProperties,
         const uno::Reference< text::XTextRange >& xInsertPosition)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
+    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     if (!m_bIsValid)
     {
commit 20655772140c425e2e4957efc24413683f1b9e2c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 27 18:55:17 2015 +0100

    coverity#1308475 Uncaught exception
    
    Change-Id: Ib7bb9cb08676c3248a65f80ee06cf11894c307ad

diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 50f1c96..b434927 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1075,7 +1075,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
 uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
         const uno::Sequence< beans::PropertyValue >& rValues,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception )
+    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index f094fc8..47e5ff2 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -197,7 +197,7 @@ private:
                     ::com::sun::star::beans::PropertyValue >& rValues,
             const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
-        throw( ::com::sun::star::uno::Exception );
+        throw( ::com::sun::star::uno::Exception, std::exception );
 
     void insert( sal_Int32 nNameClashResolve,
                  const ::com::sun::star::uno::Reference<
commit 0644b0219b6887a79a5864b5777b2c8d5fdd4f44
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 27 18:53:57 2015 +0100

    coverity#1308473 Uncaught exception
    
    Change-Id: I554f7edb9f08c473a54f8b14206e5ae57bdf6470

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index a8b8a13..22f8284 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -577,7 +577,7 @@ ShutdownIcon* ShutdownIcon::createInstance()
     return pShutdownIcon;
 }
 
-void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception )
+void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception, std::exception )
 {
     // access resource system and sfx only protected by solarmutex
     ::SolarMutexGuard aSolarGuard;
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index 9e9db7a..b4cd38f 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -108,7 +108,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase
         static bool GetAutostart();
         static bool bModalMode;
 
-        void init() throw( ::com::sun::star::uno::Exception );
+        void init() throw( ::com::sun::star::uno::Exception, std::exception );
 
         OUString GetResString( int id );
         static OUString GetUrlDescription( const OUString& aUrl );
commit d7847d7998805a61d8c8b5723c43c19d44cc9ba7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 27 18:53:19 2015 +0100

    coverity#1308472 Uncaught exception
    
    Change-Id: I264efd2a0c379ee9fcdb3e2a58d425a62e086d09

diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index d268c4b..6e22cd3 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -240,7 +240,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::
     }
 }
 
-uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException, script::BasicErrorException)
+uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException, script::BasicErrorException, std::exception)
 {
     mxModel->lockControllers();
 
diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx
index 2074cc8..4a1ec3f4 100644
--- a/sw/source/ui/vba/vbaview.hxx
+++ b/sw/source/ui/vba/vbaview.hxx
@@ -35,7 +35,7 @@ private:
     css::uno::Reference< css::text::XTextViewCursor > mxViewCursor;
     css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
 
-    css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException, css::script::BasicErrorException);
+    css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception);
     css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
 
 public:
commit 710a14784991674213b6f22f2cab743b3338599e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 27 18:52:22 2015 +0100

    coverity#1308471 Uncaught exception
    
    Change-Id: I63e8fdf64b8b2f8fa554d56b550cb88ad70eaeba

diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 85b187b..4c91b86 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -208,7 +208,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
 
 static void
 lcl_setCharStyle(SwDoc *const pDoc, const uno::Any & rValue, SfxItemSet & rSet)
-throw (lang::IllegalArgumentException)
+    throw (lang::IllegalArgumentException, std::exception)
 {
     SwDocShell *const pDocSh = pDoc->GetDocShell();
     if(pDocSh)
commit adfa5083bc9656feb3b1e6cb409322d330acd85b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 27 18:51:19 2015 +0100

    coverity#1308469 Uncaught exception
    
    Change-Id: If59b1c92f8219713cef21ea32747af9174c94852

diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 33230c9..a1523b5 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1907,7 +1907,7 @@ void Content::notifyChildInserted( const OUString & rRelativeChildUri )
 void Content::transfer(
             const ucb::TransferInfo& rInfo,
             const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception )
+    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 16aa946..21bdc0c 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -198,7 +198,7 @@ private:
     void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo,
                    const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
-        throw( ::com::sun::star::uno::Exception );
+        throw( ::com::sun::star::uno::Exception, std::exception );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
     getPropertyValues( const ::com::sun::star::uno::Reference<


More information about the Libreoffice-commits mailing list