[Libreoffice-commits] core.git: 3 commits - forms/source sw/source

Caolán McNamara caolanm at redhat.com
Tue Apr 22 13:12:47 PDT 2014


 forms/source/xforms/model.hxx       |    2 +-
 sw/source/core/unocore/unotbl.cxx   |    5 ++---
 sw/source/ui/vba/vbatablehelper.cxx |    2 +-
 sw/source/ui/vba/vbatablehelper.hxx |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit f8fd4b70717ee2fc9a3b3f25ebf9e1b6a91a7a25
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 22 21:08:34 2014 +0100

    coverity#704968 Unchecked dynamic_cast
    
    Change-Id: Ifa12e220208d9a67213d1a58ab7e2b67083e2968

diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 57096bc..0d60435 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1612,11 +1612,10 @@ OUString SwXTextTableCursor::getRangeName()
     SolarMutexGuard aGuard;
     OUString aRet;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
-
+    SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
     //!! see also SwChartDataSequence::getSourceRangeRepresentation
-    if(pUnoCrsr)
+    if (pTblCrsr)
     {
-        SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
         pTblCrsr->MakeBoxSels();
         const SwStartNode* pNode = pTblCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
         const SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
commit 8e7ec95d7c461410477cc9eaed74c7269b50be10
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 22 21:06:09 2014 +0100

    coverity#989725 Uncaught exception
    
    Change-Id: I8904995c474146746623cfda36b8ddb81146070c

diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 2a2f1fb..9f659b1 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -230,7 +230,7 @@ sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) thro
     return nWidth;
 }
 
-void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly ) throw (css::uno::RuntimeException)
+void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly ) throw (css::uno::RuntimeException, std::exception)
 {
     double dAbsWidth = Millimeter::getInHundredthsOfOneMillimeter( _width );
     sal_Int32 nTableWidth = getTableWidth( );
diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx
index 0c636ad..e5b31fb 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -47,7 +47,7 @@ public:
     sal_Int32 getTableWidth( ) throw (css::uno::RuntimeException);
 
     sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly  = false ) throw (css::uno::RuntimeException);
-    void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly  = false ) throw (css::uno::RuntimeException);
+    void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly  = false ) throw (css::uno::RuntimeException, std::exception);
 
     static SwTable* GetSwTable( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException);
     static OUString getColumnStr( sal_Int32 nCol );
commit 529215e4230189f9fa0ef68031c98203e09b5729
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 22 21:04:17 2014 +0100

    coverity#989724 Uncaught exception
    
    Change-Id: Ia3a74e71b95d263a4d911523d77fd6d8e65adc69

diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index a4dc08f..35057e9 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -299,7 +299,7 @@ public:
         { PropertySetBase::addVetoableChangeListener(p1, p2); }
 
     virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+        throw( css::beans::UnknownPropertyException,  css::uno::RuntimeException, std::exception ) SAL_OVERRIDE
         { PropertySetBase::removeVetoableChangeListener(p1, p2); }
 
     virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo()


More information about the Libreoffice-commits mailing list