[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source

Steve Yin steve_y at apache.org
Mon Jan 6 02:07:20 PST 2014


 sc/source/ui/Accessibility/AccessibleCell.cxx        |    2 +-
 sc/source/ui/Accessibility/AccessibleDocument.cxx    |    8 ++++----
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |    8 ++++----
 sc/source/ui/inc/AccessibleCell.hxx                  |    3 +--
 sc/source/ui/inc/AccessibleSpreadsheet.hxx           |   11 ++++-------
 5 files changed, 14 insertions(+), 18 deletions(-)

New commits:
commit 15e6a8263ae6181ac4912b94af8cb63adc34a86d
Author: Steve Yin <steve_y at apache.org>
Date:   Mon Jan 6 09:42:20 2014 +0000

    Rolled back some coverity issue fixes for mac build

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index c7d0c29..084b420 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -510,7 +510,7 @@ void ScAccessibleCell::AddRelation(const ScRange& rRange,
 }
 
 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)
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index d127a47..b8ef809 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -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 (::accessibility::AccessibleShape* pCurr
     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 (::accessibility::AccessibleShape* pCurr
 }
 ::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++)
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index b5d1a80..8785252 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1490,7 +1490,7 @@ Rectangle ScAccessibleSpreadsheet::GetVisCells(const Rectangle& rVisArea)
         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 ScAccessibleSpreadsheet::selectRow( sal_Int32 row )
 }
 
 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 ScAccessibleSpreadsheet::selectColumn( sal_Int32 column )
 }
 
 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 ScAccessibleSpreadsheet::unselectRow( sal_Int32 row )
 }
 
 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())
     {
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index b47f7da..92a8ae0 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -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 )
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 7d44025..926ed95 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -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.


More information about the Libreoffice-commits mailing list