sc/inc/docuno.hxx | 3 ++- sc/inc/viewuno.hxx | 6 ++++-- sc/source/core/opencl/opencl_device_selection.h | 2 +- sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 4 ++-- sc/source/ui/Accessibility/AccessibleTableBase.cxx | 6 ++++-- sc/source/ui/inc/AccessibleSpreadsheet.hxx | 6 ++++-- sc/source/ui/inc/AccessibleTableBase.hxx | 6 ++++-- sc/source/ui/unoobj/docuno.cxx | 6 +++--- sc/source/ui/unoobj/viewuno.cxx | 5 +++-- sw/source/filter/ww8/ww8par6.cxx | 8 +++++++- 10 files changed, 34 insertions(+), 18 deletions(-)
New commits: commit 2db20a6d2cc51a8bec911f8c8ccefa94f5d5a2e3 Author: Caolán McNamara <[email protected]> Date: Fri Jan 24 09:33:57 2014 +0000 coverity#1158387 Uncaught exception Change-Id: I8a058e4f5ef988f527c266926dcb7c1fd7d66a40 diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 9b1dd41..e6883f8 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -233,7 +233,8 @@ public: // XSelectionSupplier virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, + std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index f269657..9b23763 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -695,7 +695,8 @@ static void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrO } sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) - throw(lang::IllegalArgumentException, uno::RuntimeException) + throw(lang::IllegalArgumentException, uno::RuntimeException, + std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); commit 13905ab5826307654cfa45ad544a673946424fca Author: Caolán McNamara <[email protected]> Date: Fri Jan 24 09:32:59 2014 +0000 coverity#1158388 Uncaught exception Change-Id: Iac1719c5ea44369c7c0c323a0784a320af5d4e5a diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index fc97d4b..9b1dd41 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -332,7 +332,8 @@ public: virtual sal_Int32 SAL_CALL getSplitHorizontal() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSplitVertical() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSplitColumn() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSplitRow() throw(::com::sun::star::uno::RuntimeException); + 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); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 369cb4e..f269657 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1664,7 +1664,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn() throw(uno::RuntimeException) return 0; } -sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException) +sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); commit 70f8d0ce223d723b8cdb5cb862ace8239d646073 Author: Caolán McNamara <[email protected]> Date: Fri Jan 24 09:29:43 2014 +0000 coverity#1158391 Uncaught exception Change-Id: Iabe167ec7b1f4ad2a80ddbdb07e790dacbf126ab diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 9def14f..674638c 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1473,7 +1473,7 @@ Rectangle ScAccessibleSpreadsheet::GetVisCells(const Rectangle& rVisArea) } sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row ) -throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { if (IsFormulaMode()) { diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 0adb7db..a0f937c 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -498,7 +498,8 @@ void ScAccessibleTableBase::CommitTableModelChange(sal_Int32 nStartRow, sal_Int3 } sal_Bool SAL_CALL ScAccessibleTableBase::selectRow( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, + std::exception) { return sal_True; } diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 36f8a5f..65f1318 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -242,7 +242,8 @@ private: throw (com::sun::star::uno::RuntimeException); //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( 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 selectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index e604c5d..51e901f 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -196,7 +196,8 @@ public: throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); virtual sal_Bool SAL_CALL selectRow( 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 selectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); commit a85fff6b062b9c2aa9b5f85e4723fdc416885c4d Author: Caolán McNamara <[email protected]> Date: Fri Jan 24 09:23:49 2014 +0000 coverity#1158390 Uncaught exception Change-Id: I12c1c2bb1136ff57a729787c94997b2468340b4d diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index c4fbadd..9def14f 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1522,7 +1522,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row ) } sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { if (IsFormulaMode()) { diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index cfbd3dd..0adb7db 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -518,7 +518,8 @@ sal_Bool SAL_CALL ScAccessibleTableBase::unselectRow( sal_Int32 ) } sal_Bool SAL_CALL ScAccessibleTableBase::unselectColumn( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, + std::exception) { return sal_True; } diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index de9f79a..36f8a5f 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -250,7 +250,8 @@ private: 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) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + std::exception); protected: /// Return the object's current bounding box relative to the desktop. diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index a9d699e..e604c5d 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -204,7 +204,8 @@ public: 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) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, + std::exception); protected: /// Return this object's description. commit 64125a0b87c51f34ac8fa148749807d5deaed3d2 Author: Caolán McNamara <[email protected]> Date: Fri Jan 24 09:22:18 2014 +0000 coverity#1158389 Uncaught exception Change-Id: I943e33bfd40378da63661ce34ca8d4638018bcd1 diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index a8b6b26..da23e4e 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -163,7 +163,8 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, + std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 823c12c..088a7a9 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -932,9 +932,9 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, } -sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection, - const uno::Sequence<beans::PropertyValue>& rOptions ) - throw (lang::IllegalArgumentException, uno::RuntimeException) +sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection, + const uno::Sequence<beans::PropertyValue>& rOptions) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) commit bfd17da03a138cbf911a3e080407c0bbdd9bef22 Author: Caolán McNamara <[email protected]> Date: Fri Jan 24 09:17:33 2014 +0000 coverity#1157757 Logically dead code must have meant deviceScoreStart here Change-Id: I24530d0674e0a9de373bf54cfc3e3ae5ff124752 diff --git a/sc/source/core/opencl/opencl_device_selection.h b/sc/source/core/opencl/opencl_device_selection.h index 74d2f1f..85ee9f6 100644 --- a/sc/source/core/opencl/opencl_device_selection.h +++ b/sc/source/core/opencl/opencl_device_selection.h @@ -551,7 +551,7 @@ inline ds_status readProfileFromFile(ds_profile* profile, ds_score_deserializer { deviceScoreStart = findString(dataStart, contentEnd, DS_TAG_SCORE); - if (deviceNameStart == NULL) + if (deviceScoreStart == NULL) { status = DS_PROFILE_FILE_ERROR; goto cleanup; commit af34f26e94f045080c060ec47879995a0447d367 Author: Caolán McNamara <[email protected]> Date: Fri Jan 24 09:11:15 2014 +0000 coverity#704125 Operands don't affect result Change-Id: Ibc50a316a0462e01dad3aaae27d459497a3b3ae3 diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 808148a..df653db 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2275,8 +2275,14 @@ bool SwWW8ImplReader::IsDropCap() pDCS = pPlcxMan->GetPapPLCF()->HasSprm(0x442C); if(pDCS) { + /* + fdct short :3 0007 drop cap type + 0 no drop cap + 1 normal drop cap + 2 drop cap in margin + */ short nDCS = SVBT16ToShort( pDCS ); - if((nDCS | 7) != 0) + if (nDCS & 7) return true; } }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
