[Libreoffice-commits] core.git: 4 commits - sc/source svx/source
Caolán McNamara
caolanm at redhat.com
Fri Jan 24 09:23:47 PST 2014
sc/source/filter/oox/excelfilter.cxx | 4 ++++
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 7 +++----
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 5 +++--
sc/source/ui/inc/AccessibleContextBase.hxx | 6 +++---
sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 7 +++----
svx/source/unodraw/unoctabl.cxx | 9 ++-------
6 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit 7d7d6cfc2ce58a7a4a26c3d5d1ac7682785593a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 24 17:13:18 2014 +0000
coverity#1158381 Uncaught exception
Change-Id: I617b2e1a501dd2df73aa2201fa8e8e43c814d66f
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 95253d1..121d3e3 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -167,7 +167,7 @@ sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoin
uno::Reference< XAccessible > SAL_CALL ScAccessibleContextBase::getAccessibleAtPoint(
const awt::Point& /* rPoint */ )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
return uno::Reference<XAccessible>();
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 4258961..0a7a900 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1402,7 +1402,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
//===== XAccessibleComponent ============================================
uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleAtPoint( const awt::Point& rPoint )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
uno::Reference<XAccessible> xAccessible;
if (containsPoint(rPoint))
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index d917928..eb0da27 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -109,7 +109,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint(
const ::com::sun::star::awt::Point& rPoint )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index 2d81fa6..15caf19 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -57,7 +57,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint(
const ::com::sun::star::awt::Point& rPoint )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL grabFocus( )
throw (::com::sun::star::uno::RuntimeException);
commit f9f0c0d2b13099848d8ea7a68a6d4cee08f71b47
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 24 17:10:17 2014 +0000
coverity#1158382 Uncaught exception
Change-Id: Icd86cfa4ff0c4c26de0f4f9258646353e718823e
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index c11b054..95253d1 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -250,9 +250,8 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground( )
//===== XAccessibleContext ==================================================
-sal_Int32 SAL_CALL
- ScAccessibleContextBase::getAccessibleChildCount(void)
- throw (uno::RuntimeException)
+sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount()
+ throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("should be implemented in the abrevated class");
return 0;
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index d9abbb9..4258961 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1483,7 +1483,8 @@ void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeEx
//===== XAccessibleContext ==============================================
-sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount(void) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index ad598f1..d917928 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -141,8 +141,8 @@ public:
///===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
- virtual sal_Int32 SAL_CALL
- getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index 64835ab..2d81fa6 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -65,9 +65,8 @@ public:
///===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
- virtual sal_Int32 SAL_CALL
- getAccessibleChildCount(void)
- throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
commit 71bd3ad7eb7b57208053bb2e41a1a6152c56a1aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 24 17:09:01 2014 +0000
coverity#1158385 Uncaught exception
Change-Id: I204efd1c17d07f4fb24be9783d78173a57ef4ea9
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index dc6fadb..8192705 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -119,6 +119,10 @@ bool ExcelFilter::importDocument() throw()
{
SAL_WARN("sc", "exception when importing document properties " << e.Message);
}
+ catch( ... )
+ {
+ SAL_WARN("sc", "exception when importing document properties");
+ }
return true;
}
return false;
commit 306952933c87f79a61b6fb008322199d6410ade7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 24 17:05:02 2014 +0000
coverity#1158401 Uncaught exception
Change-Id: I5066b2dbf935157869fdec5ae588df649e63b6ba
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 3a3b917..2624ae6 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -36,8 +36,7 @@ private:
XColorListRef pList;
public:
- SvxUnoColorTable() throw();
- virtual ~SvxUnoColorTable() throw();
+ SvxUnoColorTable();
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( uno::RuntimeException );
@@ -63,15 +62,11 @@ public:
virtual sal_Bool SAL_CALL hasElements() throw( uno::RuntimeException);
};
-SvxUnoColorTable::SvxUnoColorTable() throw()
+SvxUnoColorTable::SvxUnoColorTable()
{
pList = XPropertyList::CreatePropertyList( XCOLOR_LIST, SvtPathOptions().GetPalettePath(), "" )->AsColorList();
}
-SvxUnoColorTable::~SvxUnoColorTable() throw()
-{
-}
-
sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
{
return cppu::supportsService( this, ServiceName );
More information about the Libreoffice-commits
mailing list