editeng/source/editeng/impedit3.cxx | 6 +++--- formula/source/ui/dlg/formula.cxx | 2 +- sc/inc/viewuno.hxx | 29 ++++++++++++++++++++--------- sc/source/ui/docshell/documentlinkmgr.cxx | 2 +- sc/source/ui/unoobj/viewuno.cxx | 24 ++++++++++++++---------- svx/source/unodraw/UnoGraphicExporter.cxx | 1 + sw/source/core/access/acctable.cxx | 10 ++++++++-- sw/source/core/access/acctable.hxx | 8 ++++++-- sw/source/core/unocore/unodraw.cxx | 5 +++-- 9 files changed, 57 insertions(+), 30 deletions(-)
New commits: commit 2e3e1caf0e0ae5c3e805ab76866dadef571f8bdf Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:37:15 2014 +0000 coverity#1158113 coverity gold, condition reversed Change-Id: Idb5f82c0e0708c85cac7f984f0273350ca665e27 diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index 8df741f..2709736 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -233,7 +233,7 @@ void DocumentLinkManager::disconnectDdeLinks() { ::sfx2::SvBaseLink* pBase = *rLinks[i]; ScDdeLink* pDdeLink = dynamic_cast<ScDdeLink*>(pBase); - if (!pDdeLink) + if (pDdeLink) pDdeLink->Disconnect(); } } commit bb5328e587f275d003ffd126abd827a59c985322 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:34:53 2014 +0000 coverity#1158124 Dereference after null check Change-Id: Ifc2d668b4dda3bc6f8a1aec97a2b9031d3cbd2e9 diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index df451a3..c16adb7 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1182,10 +1182,10 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) nTmpPortion++; nPortionEnd = nTmpPortion; // one Non-Feature-Portion has to be wrapped - if ( pPortion->GetLen() > 1 ) + if ( pPortion && pPortion->GetLen() > 1 ) { - DBG_ASSERT( pPortion && (pPortion->GetKind() == PORTIONKIND_TEXT), "Len>1, but no TextPortion?" ); - nTmpWidth -= pPortion ? pPortion->GetSize().Width() : 0; + DBG_ASSERT( pPortion->GetKind() == PORTIONKIND_TEXT, "Len>1, but no TextPortion?" ); + nTmpWidth -= pPortion->GetSize().Width(); sal_uInt16 nP = SplitTextPortion( pParaPortion, nTmpPos, pLine ); const TextPortion* p = pParaPortion->GetTextPortions()[nP]; DBG_ASSERT( p, "Portion ?!" ); commit cdd1d19406726c9cbeb9969b99dc03cadbaf1050 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:30:08 2014 +0000 coverity#1158171 Missing break in switch Change-Id: I20979bf40aeb2d14ffd78097a7ee9208ff53cec6 diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index ce70903..3f67ed4 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -362,6 +362,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo) break; case SVX_ROMAN_UPPER: bUpper = sal_True; + /* Fall through */ case SVX_ROMAN_LOWER: aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper); break; commit 9b667561c31cb61a9e71673626b0309e9c6d477b Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:28:05 2014 +0000 coverity#1158192 Improper use of negative value Change-Id: Ie5b455f3895e9ff53caf773e319d3342642b9945 diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 8a855d7..257de49 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -500,7 +500,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos) eOp == m_aSpecialOpCodes[sheet::FormulaMapGroupSpecialOffset::SPACES].Token.OpCode ) { const sal_Int32 n1 = aFormString.indexOf(sep, nTokPos); - const sal_Int32 n2 = aFormString.indexOf(')',nTokPos); + const sal_Int32 n2 = nTokPos < 0 ? -1 : aFormString.indexOf(')',nTokPos); sal_Int32 nXXX = nTokPos; if( n1 < n2 ) { commit 8229f7557f019364565b53919419326202d788a9 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:26:06 2014 +0000 coverity#1158197 Dereference null return value Change-Id: I199668668ceff1731b10d63c51fa3bda56d7ae2a diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 928e301..c0ef2c6 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -2067,7 +2067,8 @@ void SwXShape::dispose(void) throw( uno::RuntimeException ) if(pFmt) { // determine correct <SdrObject> - SdrObject* pObj = GetSvxShape()->GetSdrObject(); + SvxShape* pSvxShape = GetSvxShape(); + SdrObject* pObj = pSvxShape ? pSvxShape->GetSdrObject() : NULL; // safety assertion: // <pObj> must be the same as <pFmt->FindSdrObject()>, if <pObj> isn't // a 'virtual' drawing object. commit 9d6d353a66832b70dadb3f55182baaa074b162bd Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:24:44 2014 +0000 coverity#1158198 Dereference null return value Change-Id: I72bb6d3c2a140653b35dc1bffe764114ca4f0578 diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index bc45c31..928e301 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1729,7 +1729,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( SvxShape* pSvxShape = GetSvxShape(); bool bGroupMember = false; bool bFormControl = false; - SdrObject* pObject = pSvxShape->GetSdrObject(); + SdrObject* pObject = pSvxShape ? pSvxShape->GetSdrObject() : NULL; if(pObject) { bGroupMember = pObject->GetUpGroup() != 0; commit c4f057c1d09343933f2f3fa8fe85d1a738824870 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:21:11 2014 +0000 coverity#1158276 Uncaught exception Change-Id: Ifff7d9c83d8e757817b2886e12c2aebf453157b1 diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 1341486..00d7282 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1848,8 +1848,11 @@ sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row ) } return sal_True; } + sal_Bool SAL_CALL SwAccessibleTable::unselectColumn( sal_Int32 column ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, + uno::RuntimeException, + std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 0d1617d..ea4dc8f 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -195,7 +195,9 @@ public: ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, + ::com::sun::star::uno::RuntimeException, + std::exception); //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. commit 9cb625b63565c10a856b6db66a6ac02115eff93f Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:20:09 2014 +0000 coverity#1158277 Uncaught exception Change-Id: Ifa1cd70f830a3afa6b3a503b831bcfe99c5cf2fd diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 0b82539..1341486 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1827,8 +1827,11 @@ sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column ) } return sal_True; } + sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, + uno::RuntimeException, + std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 6ee40f7..0d1617d 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -191,7 +191,9 @@ public: virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, + ::com::sun::star::uno::RuntimeException, + std::exception); virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ; //===== XServiceInfo ==================================================== commit 218c9cff53c36d3f6e744067d5812b883a60b459 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:18:13 2014 +0000 coverity#1158308 Uncaught exception Change-Id: If099f099687f3157f9037c6b6e54ae0c4241f47e diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 70268f8..25f5576 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -86,7 +86,8 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getVisibleRange() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, + std::exception); // XCellRangeReferrer virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index c387b07..f9c9895 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -257,7 +257,8 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) } } -table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() throw(uno::RuntimeException) +table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellRangeAddress aAdr; commit 6a59858cd81615914d683fd5959741549fa1fa69 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:17:30 2014 +0000 coverity#1158309 Uncaught exception Change-Id: I892bff01a53629ab4d6f5e96ab4c408ab6214849 diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index c6c676d..70268f8 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -83,7 +83,8 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, + std::exception); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getVisibleRange() throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index b611a3d..c387b07 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -241,7 +241,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeExcept } void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pViewShell) commit 0e51bb8ca0fb362a8c39282168a453c438ba8772 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:16:42 2014 +0000 coverity#1158310 Uncaught exception Change-Id: I38fcbe9aa35283b9287962a2974365ceb29df37c diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 6b97626..c6c676d 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -401,7 +401,8 @@ public: // XSelectedSheetsSupplier virtual ::com::sun::star::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, + std::exception); }; class ScPreviewObj : public SfxBaseController, diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index ca51e4f..b611a3d 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -2330,7 +2330,7 @@ uno::Sequence<sal_Int32> toSequence(const ScMarkData::MarkedTabsType& rSelected) } uno::Sequence<sal_Int32> ScTabViewObj::getSelectedSheets() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ScTabViewShell* pViewSh = GetViewShell(); if (!pViewSh) commit 50f2c8a442d2e1bb769abd5a7edaf357ba9e20b4 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:15:46 2014 +0000 coverity#1158311 Uncaught exception Change-Id: Idbfe94b889023a9132db659d528109f260b8fa01 diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 70c00d5..6b97626 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -394,7 +394,10 @@ public: // XTransferableSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) + throw(::com::sun::star::datatransfer::UnsupportedFlavorException, + ::com::sun::star::uno::RuntimeException, + std::exception); // XSelectedSheetsSupplier virtual ::com::sun::star::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index f9ad94c..ca51e4f 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -2287,7 +2287,10 @@ ScTabViewObj* ScTabViewObj::getImplementation( const uno::Reference<uno::XInterf return xTransferable; } -void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) + throw (::com::sun::star::datatransfer::UnsupportedFlavorException, + ::com::sun::star::uno::RuntimeException, + std::exception) { SolarMutexGuard aGuard; ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); commit 125f1ad355490a8c141d7322b99c33be6023b769 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:14:36 2014 +0000 coverity#1158312 Uncaught exception Change-Id: Ic9f49d79474c0c7f5a04bec499e05bd48aad0f3a diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index c0f37cb..70c00d5 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -311,7 +311,8 @@ public: getActiveSheet() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setActiveSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& xActiveSheet ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, + std::exception); //XEnhancedMouseClickBroadcaster diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index ce5ca73..f9ad94c 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1105,7 +1105,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet() // support expand (but not replace) the active sheet void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreadsheet>& xActiveSheet ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; commit 1590e29eda3dc0ee52e105dceaad02cc1ce39f1a Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:13:42 2014 +0000 coverity#1158313 Uncaught exception Change-Id: Ice180d260685f6c9971a5daec18bf98b329bd4be diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index dbcb96a..c0f37cb 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -341,7 +341,8 @@ public: virtual sal_Int32 SAL_CALL getSplitRow() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, + std::exception); // XViewFreezable virtual sal_Bool SAL_CALL hasFrozenPanes() throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 8c0ec30..ce5ca73 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1690,7 +1690,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException, std: } void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); commit 4efedf4c9b1e0f88848b195a15152ebc76bb0a19 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:12:57 2014 +0000 coverity#1158314 Uncaught exception Change-Id: Icaaaf9eab3dfd9c15f64b60f2fd3a571c5a09888 diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index ccabc97..dbcb96a 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -346,7 +346,8 @@ public: // XViewFreezable virtual sal_Bool SAL_CALL hasFrozenPanes() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, + std::exception); // XRangeSelection virtual void SAL_CALL startRangeSelection( const ::com::sun::star::uno::Sequence< diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 9a15407..8c0ec30 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1703,7 +1703,7 @@ void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixel } void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); commit 9eefa85dd2f4271c56538186afda7abf0a3ef778 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:11:47 2014 +0000 coverity#1158315 Uncaught exception Change-Id: Id0bc9f0f1fd6c8653e41a9e8c5319ab013416102 diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 2242a2b..ccabc97 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -263,7 +263,8 @@ public: const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, + std::exception); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index e6ad2d8..9a15407 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1949,8 +1949,8 @@ void SAL_CALL ScTabViewObj::setPropertyValue( } uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, + uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aString(aPropertyName); commit 21cbcf9969188e7a7b3c83e9197ab8b5a1c95e4f Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 29 11:10:57 2014 +0000 coverity#1158316 Uncaught exception Change-Id: Ia696a7e1a4474bd0dc45db0bec951070c294da77 diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 84529dc..2242a2b 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -250,7 +250,8 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, + std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 3d596c5..e6ad2d8 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1815,7 +1815,7 @@ void ScTabViewObj::SelectionChanged() //! auch an der Applikation anbieten? uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef(
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits