[Libreoffice-commits] core.git: 11 commits - connectivity/source sc/inc sc/source sw/source
Caolán McNamara
caolanm at redhat.com
Thu Jan 23 12:35:59 PST 2014
connectivity/source/drivers/dbase/DIndex.cxx | 8 +++-----
connectivity/source/drivers/dbase/dindexnode.cxx | 3 ++-
sc/inc/cursuno.hxx | 2 +-
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 4 ++--
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 4 ++--
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 2 +-
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 4 ++--
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 4 ++--
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 10 ++++++----
sc/source/ui/inc/AccessibleCellBase.hxx | 4 ++--
sc/source/ui/inc/AccessibleContextBase.hxx | 4 ++--
sc/source/ui/inc/AccessiblePreviewCell.hxx | 2 +-
sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 4 ++--
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 6 ++++--
sc/source/ui/inc/AccessibleTableBase.hxx | 6 ++++--
sc/source/ui/unoobj/cursuno.cxx | 4 ++--
sw/source/core/frmedt/fefly1.cxx | 2 +-
sw/source/core/txtnode/atrfld.cxx | 5 ++++-
18 files changed, 43 insertions(+), 35 deletions(-)
New commits:
commit 61360536d775aaf7f6006291b77f4fb9f86ed89d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:33:28 2014 +0000
coverity#440728 Explicit null dereferenced
Change-Id: I76b8d6eb59d2558a7ff8a1b1573f24e41a03b8b6
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 55790e9..46237e7 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -557,11 +557,9 @@ sal_Bool ODbaseIndex::CreateImpl()
if(xSet->last())
{
- Reference< XUnoTunnel> xTunnel(xSet,UNO_QUERY);
- ODbaseResultSet* pDbaseRes = NULL;
- if(xTunnel.is())
- pDbaseRes = reinterpret_cast< ODbaseResultSet* >( xTunnel->getSomething(ODbaseResultSet::getUnoTunnelImplementationId()) );
- OSL_ENSURE(pDbaseRes,"No dbase resultset found? What's going on here!");
+ Reference< XUnoTunnel> xTunnel(xSet, UNO_QUERY_THROW);
+ ODbaseResultSet* pDbaseRes = reinterpret_cast< ODbaseResultSet* >( xTunnel->getSomething(ODbaseResultSet::getUnoTunnelImplementationId()) );
+ assert(pDbaseRes); //"No dbase resultset found? What's going on here!
Reference<XRowLocate> xRowLocate(xSet,UNO_QUERY);
nRowsLeft = xSet->getRow();
commit e4c7cfed889c4cbfdfc301bd2d501b6b542d3957
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:30:51 2014 +0000
coverity#1130492 Unused pointer value
Change-Id: I4ce6890fcbd88b0751f4902ff314b1207cd5158a
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 7bef646..239d523 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1899,7 +1899,7 @@ sal_Bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFl
// delete "Sdr-Object", insert the graphic instead
DelSelectedObj();
- pFmt = GetDoc()->Insert( *GetCrsr(), rGrfName, rFltName, pGrf, &aFrmSet, NULL, NULL );
+ GetDoc()->Insert( *GetCrsr(), rGrfName, rFltName, pGrf, &aFrmSet, NULL, NULL );
EndUndo();
EndAllAction();
commit 0abd70662929c5a7b173be1b41dac4dea434b3e1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:28:39 2014 +0000
coverity#1158137 Unchecked dynamic_cast
Change-Id: I58b1fe696ab25403838f15928b19460b02a9e97d
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index e1477f1..15c7a38 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -96,7 +96,10 @@ SwFmtFld::SwFmtFld( const SwFmtFld& rAttr )
{
// input field in-place editing
SetWhich( RES_TXTATR_INPUTFIELD );
- dynamic_cast<SwInputField*>(GetField())->SetFmtFld( *this );
+ SwInputField *pField = dynamic_cast<SwInputField*>(GetField());
+ assert(pField);
+ if (pField)
+ pField->SetFmtFld( *this );
}
else if ( GetField()->GetTyp()->Which() == RES_POSTITFLD )
{
commit 89f7da7ac180dd15a06bef32f447f997e1fdff03
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:25:57 2014 +0000
coverity#1158204 Unintentional integer overflow
Change-Id: I8e10fb52803dbd81e5490940a9a7e529beebc803
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index aabc1c1..963a400 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -848,7 +848,8 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
SvStream& connectivity::dbase::WriteONDXPage(SvStream &rStream, const ONDXPage& rPage)
{
// Page doesn't exist yet
- sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * DINDEX_PAGE_SIZE;
+ sal_Size nSize = rPage.GetPagePos() + 1;
+ nSize *= DINDEX_PAGE_SIZE;
if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
{
rStream.SetStreamSize(nSize);
commit 1f10d5f71fbd4d03e6268a4156c1d0be13796327
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:21:33 2014 +0000
coverity#1158392 Uncaught exception
Change-Id: Ifbf896bf8c13e83279e481e06098b7ed6ea0116c
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 5c66021..c4fbadd 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1505,7 +1505,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column )
}
sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( 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 06a5a04..cfbd3dd 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -498,26 +498,27 @@ 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)
{
return sal_True;
}
sal_Bool SAL_CALL ScAccessibleTableBase::selectColumn( sal_Int32 )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
- std::exception)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
+ std::exception)
{
return sal_True;
}
sal_Bool SAL_CALL ScAccessibleTableBase::unselectRow( sal_Int32 )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
+ std::exception)
{
return sal_True;
}
sal_Bool SAL_CALL ScAccessibleTableBase::unselectColumn( sal_Int32 )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
return sal_True;
}
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index b535811..de9f79a 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -247,7 +247,8 @@ private:
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException,
std::exception);
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) ;
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index efa543c..a9d699e 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -201,7 +201,8 @@ public:
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException,
std::exception);
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) ;
commit 94ab3a001cfbbf9da231b1b6189d2a1d74f63e2b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:18:54 2014 +0000
coverity#1158393 Uncaught exception
Change-Id: I1b42c0e76da019e1828dd6318dc22c7811ea7429
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 9179488..5c66021 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1489,7 +1489,7 @@ throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
}
sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( 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 9963e34..06a5a04 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -504,7 +504,8 @@ throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
}
sal_Bool SAL_CALL ScAccessibleTableBase::selectColumn( 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 b2354aa..b535811 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -244,7 +244,8 @@ private:
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
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) ;
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index 42476f3..efa543c 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -198,7 +198,8 @@ public:
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
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) ;
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
commit 4967f27136397b551307d344396ae7de8d34c81e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:16:50 2014 +0000
coverity#1158399 Uncaught exception
Change-Id: I1217daedb7af3daf7b8d59f3dc5e68d50068d5e1
diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx
index 8b3b434..fba4a71 100644
--- a/sc/inc/cursuno.hxx
+++ b/sc/inc/cursuno.hxx
@@ -51,7 +51,7 @@ public:
// XUsedAreaCursor
virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index fdde15a..529ad63 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -239,8 +239,8 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo
// XUsedAreaCursor
-void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea( sal_Bool bExpand )
- throw(uno::RuntimeException)
+void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea(sal_Bool bExpand)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
commit 2de1ddd780eff44131b08c6c1f2326a70258a647
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:14:26 2014 +0000
coverity#1158402 Uncaught exception
Change-Id: I71556f797bf7e34f37b7022448019d5d03d8383a
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index d1817b3..e63efe4 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -70,8 +70,8 @@ ScAccessibleCellBase::~ScAccessibleCellBase()
//===== XAccessibleComponent ============================================
-sal_Bool SAL_CALL ScAccessibleCellBase::isVisible( )
- throw (uno::RuntimeException)
+sal_Bool SAL_CALL ScAccessibleCellBase::isVisible()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 2817822..4fe9288 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -224,8 +224,8 @@ sal_Bool SAL_CALL ScAccessibleContextBase::isShowing( )
return bShowing;
}
-sal_Bool SAL_CALL ScAccessibleContextBase::isVisible( )
- throw (uno::RuntimeException)
+sal_Bool SAL_CALL ScAccessibleContextBase::isVisible()
+ throw (uno::RuntimeException, std::exception)
{
return sal_True;
}
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index 4cfe1da..66f0fc7 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -58,8 +58,8 @@ public:
///===== XAccessibleComponent ============================================
- virtual sal_Bool SAL_CALL isVisible( )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isVisible()
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getForeground( )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index 526eeec..acbab2c 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -126,8 +126,8 @@ public:
virtual sal_Bool SAL_CALL isShowing( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isVisible( )
- throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isVisible()
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL grabFocus( )
throw (::com::sun::star::uno::RuntimeException);
commit a8772c4fc0963d5a864eeecf2e19004c5533d290
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:13:16 2014 +0000
coverity#1158403 Uncaught exception
Change-Id: I477e6e0daf54c78034e875e86e8c7101458cc716
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 12cf92c..42dd8e2 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -357,7 +357,7 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (u
return aCellRect;
}
-Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::RuntimeException)
+Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::RuntimeException, std::exception)
{
FillTableInfo();
diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
index 27f0672..4bcf6c0 100644
--- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
@@ -121,7 +121,7 @@ protected:
virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException);
virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException);
+ virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception);
private:
ScPreviewShell* mpViewShell;
commit a948fe8ac87b42334caa69e6e0fece624bbe3550
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:11:46 2014 +0000
coverity#1158404 Uncaught exception
Change-Id: Id07436b8bcb201cf3b92805114ee67b71986cb18
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index f67081b..12cf92c 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -330,7 +330,7 @@ uno::Sequence<sal_Int8> SAL_CALL
//==== internal =========================================================
-Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException)
+Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception)
{
Rectangle aCellRect;
diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
index 5ba5d7c..27f0672 100644
--- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
@@ -120,7 +120,7 @@ protected:
virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException);
virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException);
- virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException);
+ virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception);
virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException);
private:
commit 23f26db1ac618f5594789c6d3cfe1876014c1058
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 23 20:10:09 2014 +0000
coverity#1158406 Uncaught exception
Change-Id: If92dff41642a04bc5d46d3ee26fb7bdc780f9106
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 991b496..d294134 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -230,7 +230,7 @@ Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw (uno::Ru
return aCellRect;
}
-Rectangle ScAccessiblePreviewCell::GetBoundingBox() const throw (uno::RuntimeException)
+Rectangle ScAccessiblePreviewCell::GetBoundingBox() const throw (uno::RuntimeException, std::exception)
{
Rectangle aCellRect;
if (mpViewShell)
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index 692ed11..daf187e 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -88,7 +88,7 @@ public:
protected:
virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException);
+ virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception);
private:
ScPreviewShell* mpViewShell;
More information about the Libreoffice-commits
mailing list