Author: steve_y Date: Mon Jan 6 09:42:20 2014 New Revision: 1555701 URL: http://svn.apache.org/r1555701 Log: Rolled back some coverity issue fixes for mac build
Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx openoffice/trunk/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx?rev=1555701&r1=1555700&r2=1555701&view=diff ============================================================================== --- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx (original) +++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx Mon Jan 6 09:42:20 2014 @@ -510,7 +510,7 @@ void ScAccessibleCell::AddRelation(const } uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, com::sun::star::ucb::CommandFailedException) + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { uno::Any strRet; if (mpViewShell) Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx?rev=1555701&r1=1555700&r2=1555701&view=diff ============================================================================== --- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx (original) +++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Mon Jan 6 09:42:20 2014 @@ -257,12 +257,12 @@ public: virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel (::com::sun::star::beans::XPropertySet* pSet) - throw (::com::sun::star::uno::RuntimeException, com::sun::star::ucb::CommandFailedException); + throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetAccessibleCaption (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException, com::sun::star::ucb::CommandFailedException); + throw (::com::sun::star::uno::RuntimeException); ///===== Internal ======================================================== void SetDrawBroadcaster(); @@ -483,7 +483,7 @@ sal_Bool ScChildrenShapes::ReplaceChild return bResult; } -::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException, com::sun::star::ucb::CommandFailedException) +::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 count = GetCount(); for (sal_Int32 index=0;index<count;index++) @@ -504,7 +504,7 @@ sal_Bool ScChildrenShapes::ReplaceChild } ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException, com::sun::star::ucb::CommandFailedException) + throw (::com::sun::star::uno::RuntimeException) { sal_Int32 count = GetCount(); for (sal_Int32 index=0;index<count;index++) Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx?rev=1555701&r1=1555700&r2=1555701&view=diff ============================================================================== --- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx (original) +++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx Mon Jan 6 09:42:20 2014 @@ -1490,7 +1490,7 @@ Rectangle ScAccessibleSpreadsheet::GetVi return Rectangle(); } sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, ucb::CommandFailedException, ucb::ContentCreationException) +throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { if (IsFormulaMode()) { @@ -1506,7 +1506,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee } sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, ucb::CommandFailedException, ucb::ContentCreationException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { if (IsFormulaMode()) { @@ -1522,7 +1522,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee } sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, ucb::CommandFailedException, ucb::ContentCreationException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { if (IsFormulaMode()) { @@ -1539,7 +1539,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadshee } sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, ucb::CommandFailedException, ucb::ContentCreationException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { if (IsFormulaMode()) { Modified: openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx?rev=1555701&r1=1555700&r2=1555701&view=diff ============================================================================== --- openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx (original) +++ openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx Mon Jan 6 09:42:20 2014 @@ -35,7 +35,6 @@ #ifndef _COM_SUN_STAR_ACCESSIBILITY_XAccessibleExtendedAttributes_HPP_ #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp> #endif -#include <com/sun/star/ucb/CommandFailedException.hpp> class ScTabViewShell; class ScAccessibleDocument; @@ -143,7 +142,7 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, com::sun::star::ucb::CommandFailedException) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ; // Override this method to handle cell's ParaIndent attribute specially. virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) Modified: openoffice/trunk/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx?rev=1555701&r1=1555700&r2=1555701&view=diff ============================================================================== --- openoffice/trunk/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx (original) +++ openoffice/trunk/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx Mon Jan 6 09:42:20 2014 @@ -28,9 +28,6 @@ #include "AccessibleTableBase.hxx" #include "viewdata.hxx" -#include <com/sun/star/ucb/CommandFailedException.hpp> -#include <com/sun/star/ucb/ContentCreationException.hpp> - #include <vector> #include "rangelst.hxx" @@ -246,13 +243,13 @@ public: 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, ::com::sun::star::ucb::CommandFailedException, com::sun::star::ucb::ContentCreationException) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::ucb::CommandFailedException, com::sun::star::ucb::ContentCreationException) ; + 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, ::com::sun::star::ucb::CommandFailedException, com::sun::star::ucb::ContentCreationException) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::ucb::CommandFailedException, com::sun::star::ucb::ContentCreationException) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ; protected: /// Return the object's current bounding box relative to the desktop.