[Libreoffice-commits] core.git: 21 commits - chart2/source cppu/source sc/inc sc/source sfx2/source svx/source sw/source vcl/source
Caolán McNamara
caolanm at redhat.com
Sat Jan 25 12:57:02 PST 2014
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 10 ++++---
cppu/source/uno/lbenv.cxx | 3 --
sc/inc/cellsuno.hxx | 20 +++++++++-----
sc/source/ui/unoobj/cellsuno.cxx | 17 ++++++-----
sfx2/source/dialog/tabdlg.cxx | 3 +-
svx/source/toolbars/fontworkbar.cxx | 3 --
sw/source/core/access/accpara.cxx | 2 -
sw/source/core/access/accpara.hxx | 3 +-
sw/source/filter/ww8/ww8atr.cxx | 2 -
vcl/source/control/button.cxx | 9 ++----
vcl/source/control/ilstbox.cxx | 3 --
vcl/source/control/scrbar.cxx | 3 --
vcl/source/control/spinbtn.cxx | 3 --
vcl/source/control/spinfld.cxx | 3 --
vcl/source/control/tabctrl.cxx | 3 --
vcl/source/filter/sgfbram.cxx | 6 ----
vcl/source/window/toolbox.cxx | 9 ------
17 files changed, 47 insertions(+), 55 deletions(-)
New commits:
commit 0f0e6217dd2ac5e20c0a55e50aa23a477ecb3d61
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:55:42 2014 +0000
coverity#738073 Uncaught exception
Change-Id: I2bdb57a23118d0ed6f8689dcd9cbefde21efcadd
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 01ec322..c4e032d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2664,7 +2664,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
}
OUString SwAccessibleParagraph::getSelectedText()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index ff02bb3..a758567 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -327,7 +327,8 @@ public:
virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSelectedText( )
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
commit 33277614dd160b56bb87b8ec2ed6c5798ab047d0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:51:58 2014 +0000
coverity#704343 Dead default in switch
only >= 0 and <= 4 are possible here, make 0 the default to keep
coverity and compilers both happy
Change-Id: I2e1e6a4ea3a1fd30f230e59ecdcb6b55e9028c08
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 5f28ed2..320eb29 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -296,8 +296,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
{
case 4 : eFTS = SDRTEXTFIT_ALLLINES; // passthrough
case 3 : eHorzAdjust = SDRTEXTHORZADJUST_BLOCK; break;
- default:
- case 0 : eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break;
+ default: eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break;
case 1 : eHorzAdjust = SDRTEXTHORZADJUST_CENTER; break;
case 2 : eHorzAdjust = SDRTEXTHORZADJUST_RIGHT; break;
}
commit c3b888d5be3f0276e40f6412cd01e5eff8ddda0e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:49:17 2014 +0000
coverity#441000 Logically dead code
Change-Id: I4fa2639b62ee08dc2367cfc975bf673cbed65fb6
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index fa9bee5..0f88c19 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -899,7 +899,6 @@ Rectangle* SpinField::ImplFindPartRect( const Point& rPt )
bool SpinField::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
const MouseEvent* pMouseEvt = NULL;
if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
@@ -944,7 +943,7 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || Edit::PreNotify(rNEvt);
+ return Edit::PreNotify(rNEvt);
}
// -----------------------------------------------------------------------
commit c4b217c03e4759cfa1341e4835e3faf32a9ca730
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:48:19 2014 +0000
coverity#440998 Logically dead code
Change-Id: Ie7647ef6fb605f14febfb83804b23d8fd62bc717
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b5d2e56..9634a31 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1533,7 +1533,6 @@ void PushButton::DataChanged( const DataChangedEvent& rDCEvt )
bool PushButton::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
const MouseEvent* pMouseEvt = NULL;
if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
@@ -1594,7 +1593,7 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || Button::PreNotify(rNEvt);
+ return Button::PreNotify(rNEvt);
}
// -----------------------------------------------------------------------
@@ -2782,7 +2781,6 @@ void RadioButton::DataChanged( const DataChangedEvent& rDCEvt )
bool RadioButton::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
const MouseEvent* pMouseEvt = NULL;
if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
@@ -2804,7 +2802,7 @@ bool RadioButton::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || Button::PreNotify(rNEvt);
+ return Button::PreNotify(rNEvt);
}
// -----------------------------------------------------------------------
commit 5e6b8aebf1a6c7ef88f8c6ee86a8984d18869ccc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:47:46 2014 +0000
coverity#440997 Logically dead code
Change-Id: Id8340d1c5c07026da7f737924d5caf3e6254c340
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index bb44426..445ec1e 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2788,7 +2788,6 @@ void ImplWin::FillLayoutData() const
bool ImplWin::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
const MouseEvent* pMouseEvt = NULL;
if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
@@ -2805,7 +2804,7 @@ bool ImplWin::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || Control::PreNotify(rNEvt);
+ return Control::PreNotify(rNEvt);
}
// -----------------------------------------------------------------------
commit 44348f093ec2e77366856ee277d67a563b67c9b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:47:13 2014 +0000
coverity#440996 Logically dead code
Change-Id: I4ef10ab73aa506394f49e5501a4f6c35543cc573
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 8d443c9..b5d2e56 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3795,7 +3795,6 @@ void CheckBox::DataChanged( const DataChangedEvent& rDCEvt )
bool CheckBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
const MouseEvent* pMouseEvt = NULL;
if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
@@ -3817,7 +3816,7 @@ bool CheckBox::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || Button::PreNotify(rNEvt);
+ return Button::PreNotify(rNEvt);
}
// -----------------------------------------------------------------------
commit 081837dbf5696988423f6858e503efd7fa9b5b5f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:46:49 2014 +0000
coverity#440995 Logically dead code
Change-Id: I8494cef9c63895c0d7b0a2377961da2df8f34606
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 53b2be2..3fd3213 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1305,7 +1305,6 @@ Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt )
bool ScrollBar::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
const MouseEvent* pMouseEvt = NULL;
if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
@@ -1343,7 +1342,7 @@ bool ScrollBar::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || Control::PreNotify(rNEvt);
+ return Control::PreNotify(rNEvt);
}
commit cb10f3324e63faf2ef6593070f195e7a52d3f4b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:46:18 2014 +0000
coverity#440994 Logically dead code
Change-Id: Ib01d71c43ab3761973a95e2faf9113ec46424e97
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 18ba220..0c1c458 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -487,7 +487,6 @@ Rectangle* SpinButton::ImplFindPartRect( const Point& rPt )
bool SpinButton::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
const MouseEvent* pMouseEvt = NULL;
if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
@@ -520,7 +519,7 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || Control::PreNotify(rNEvt);
+ return Control::PreNotify(rNEvt);
}
// -----------------------------------------------------------------------
commit ae78fd8fda475709e8738ca39ac0e5fdb741034f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:45:44 2014 +0000
coverity#440993 Logically dead code
Change-Id: I03685c9a1db89ce4365945d88ce4251ccdf32246
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index d42b98b..2c9a2da 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1631,7 +1631,6 @@ Rectangle* TabControl::ImplFindPartRect( const Point& rPt )
bool TabControl::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
const MouseEvent* pMouseEvt = NULL;
if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
@@ -1675,7 +1674,7 @@ bool TabControl::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || Control::PreNotify(rNEvt);
+ return Control::PreNotify(rNEvt);
}
// -----------------------------------------------------------------------
commit 0dda969660755caa1fe0ec2e32ba11490840c8e2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:41:42 2014 +0000
coverity#440936 Logically dead code
Change-Id: I04299880a9e5ccc5d92aa194a9cd100a46906b79
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index 66c972a..bb43d71 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -466,14 +466,13 @@ bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf)
SgfHeader aHead;
SgfEntry aEntr;
sal_uLong nNext;
- bool bRdFlag=false; // read graphics entry?
bool bRet=false; // return value
nFileStart=rInp.Tell();
rInp>>aHead;
if (aHead.ChkMagic() && aHead.Typ==SGF_SIMPVECT) {
nNext=aHead.GetOffset();
- while (nNext && !bRdFlag && !rInp.GetError()) {
+ while (nNext && !rInp.GetError()) {
rInp.Seek(nFileStart+nNext);
rInp>>aEntr;
nNext=aEntr.GetOffset();
@@ -481,9 +480,6 @@ bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf)
bRet=SgfFilterVect(rInp,aHead,aEntr,rMtf);
}
} // while(nNext)
- if (bRdFlag) {
- if (!rInp.GetError()) bRet=true; // apparently okay
- }
}
return(bRet);
}
commit cffd26d1030b67e0ed300dafd8fdb406564face6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:36:45 2014 +0000
coverity#440860 Logically dead code
Change-Id: I8e57f3ecf4e4d4052c267b6e0c435253cf5b84ec
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 514d2ef..bb91d10 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -446,26 +446,17 @@ void ToolBox::ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapp
if( pThis->mbHorz )
{
long y = 0;
- sal_Bool bDrawSep = sal_False; // pThis->ImplIsFloatingMode() && ( pThis->mnWinStyle & WB_LINESPACING );
pThis->DrawGradient( Rectangle( 0, y, aTopLineSz.Width(), y+aTopLineSz.Height()), g );
y += aTopLineSz.Height();
- if ( bDrawSep )
- pThis->DrawLine( Point(0, y-2), Point(aTopLineSz.Width(), y-2) );
-
while( y < (pThis->mnDY - aBottomLineSz.Height()) )
{
pThis->DrawGradient( Rectangle( 0, y, aLineSz.Width(), y+aLineSz.Height()), g);
y += aLineSz.Height();
-
- if ( bDrawSep )
- pThis->DrawLine( Point(0, y-2), Point(aLineSz.Width(), y-2) );
}
pThis->DrawGradient( Rectangle( 0, y, aBottomLineSz.Width(), y+aBottomLineSz.Height()), g );
- if ( bDrawSep )
- pThis->DrawLine( Point(0, y-2), Point(aBottomLineSz.Width(), y-2) );
}
else
{
commit ee446f12390220ebcac8700a4fd4a1b5ebfc948d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:34:47 2014 +0000
coverity#440744 Dereference after null check
Change-Id: Id9ab2ffde8eb82e49164350d1703e4d93f96663e
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 0ada131..6bfc27f 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1005,7 +1005,8 @@ short SfxTabDialog::Ok()
if ( pTabPage->FillItemSet( aTmp ) )
{
bModified |= sal_True;
- pExampleSet->Put( aTmp );
+ if (pExampleSet)
+ pExampleSet->Put( aTmp );
pOutSet->Put( aTmp );
}
}
commit 85344383974a7d45082c44dc679a5dc4fd2355c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:32:06 2014 +0000
coverity#1158136 Unchecked dynamic_cast
Change-Id: I8d4e7c497430faacd0d8f1138b9af8b2f11127a0
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 6e1974b..2064541 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -189,7 +189,8 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
if( m_bIsCrossingAxisIsCategoryAxis )
{
ChartModel* pModel = dynamic_cast<ChartModel*>(xChartModel.get());
- m_aCategories = DiagramHelper::getExplicitSimpleCategories( *pModel );
+ if (pModel)
+ m_aCategories = DiagramHelper::getExplicitSimpleCategories( *pModel );
}
}
@@ -197,8 +198,11 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
if ( nDimensionIndex == 0 && aData.AxisType == chart2::AxisType::CATEGORY )
{
ChartModel* pModel = dynamic_cast<ChartModel*>(xChartModel.get());
- ExplicitCategoriesProvider aExplicitCategoriesProvider( xCooSys, *pModel );
- m_bComplexCategoriesAxis = aExplicitCategoriesProvider.hasComplexCategories();
+ if (pModel)
+ {
+ ExplicitCategoriesProvider aExplicitCategoriesProvider( xCooSys, *pModel );
+ m_bComplexCategoriesAxis = aExplicitCategoriesProvider.hasComplexCategories();
+ }
}
}
}
commit 4f4a21c899499c5bb8cc1b1ccccaf66a0f6ab65e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:29:16 2014 +0000
coverity#1158251 Dereference before null check
Change-Id: I724632f66d7ec64e165b039e8b9d8c43a9f5aaa7
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index a29d249..5b45be2 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -989,8 +989,7 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
(*pWeak->harden)( &pHard, pWeak );
if (pHard)
{
- if (pEnv)
- (*pEnv->release)( pEnv );
+ (*pEnv->release)( pEnv );
*ppEnv = pHard;
}
else // registered one is dead
commit 6a52e7c94a09e285abff08a59f43ba8231f70af1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:25:16 2014 +0000
coverity#1158257 Unintended sign extension
Change-Id: I20b32255336c3efeef796df78b7af7a12dd60833
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 82a05c5..c20dac1 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4547,7 +4547,7 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
default:
break;
case SVX_LINE_SPACE_AUTO:
- nSpace = (short)( ( nSpace * rSpacing.GetPropLineSpace() ) / 100L );
+ nSpace = (short)( ( 240L * rSpacing.GetPropLineSpace() ) / 100L );
nMulti = 1;
break;
case SVX_LINE_SPACE_FIX:
commit 04f690bc01a95c74a9f480ba18ede81c4fe689e5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:20:23 2014 +0000
coverity#1158346 Uncaught exception
Change-Id: Ifd85f727dc741b2d59bfc9eebabbff24e0e69e1d
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 2650eac..a58e281 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -401,7 +401,8 @@ public:
queryEmptyCells() throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryContentCells( sal_Int16 nContentFlags )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryFormulaCells( sal_Int32 nResultFlags )
throw(::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 703b386..dab76e4 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3530,8 +3530,8 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel
}
uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentCells(
- sal_Int16 nContentFlags )
- throw(uno::RuntimeException)
+ sal_Int16 nContentFlags )
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (pDocShell)
commit f1b1e73227471192682d303a58618ca8bd65a74d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:19:29 2014 +0000
coverity#1158347 Uncaught exception
Change-Id: Iacaf59724b71d810270545d1e9dd04d59125cc92
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 47acbdd..2650eac 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -404,7 +404,8 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryFormulaCells( sal_Int32 nResultFlags )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryColumnDifferences(
const ::com::sun::star::table::CellAddress& aCompare )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 5768273..703b386 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3610,8 +3610,8 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
}
uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaCells(
- sal_Int32 nResultFlags )
- throw(uno::RuntimeException)
+ sal_Int32 nResultFlags )
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (pDocShell)
commit 262babd17e6784b307ce916e46014ef0405cca77
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:18:44 2014 +0000
coverity#1158348 Uncaught exception
Change-Id: I89dea1733a1c914a913fe31bb66b6e30c1e55dc9
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index e0e1099..47acbdd 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -394,7 +394,9 @@ public:
// XCellRangesQuery
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
- queryVisibleCells() throw(::com::sun::star::uno::RuntimeException);
+ queryVisibleCells()
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
queryEmptyCells() throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 6a8e1d0..5768273 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3455,7 +3455,7 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util:
// XCellRangesQuery
uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleCells()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (pDocShell)
commit 26d50b03c83f7d12c334c466bd3ca0be29d1f6ec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:17:48 2014 +0000
coverity#1158349 Uncaught exception
Change-Id: I9c6ff59dbb3a286a37dcef8e47f38226f6765621
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 1975069..e0e1099 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -381,7 +381,8 @@ public:
::com::sun::star::uno::Sequence< double > >& aData )
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence<
OUString >& aRowDescriptions )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index f81d688..6a8e1d0 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3178,7 +3178,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub
}
uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScMemChart* pMemChart = CreateMemChart_Impl();
commit 8fe954bf05fcbb458d1cceb36705590b5e8fbe39
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:16:58 2014 +0000
coverity#1158350 Uncaught exception
Change-Id: Ia2775cc9b93eb6805ec01a30391bcc22b175a7d3
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 07813c7..1975069 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1177,7 +1177,9 @@ public:
virtual void SAL_CALL autoOutline( const ::com::sun::star::table::CellRangeAddress& aRange )
throw(::com::sun::star::uno::RuntimeException,
std::exception);
- virtual void SAL_CALL clearOutline() throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL clearOutline()
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL hideDetail( const ::com::sun::star::table::CellRangeAddress& aRange )
throw(::com::sun::star::uno::RuntimeException,
std::exception);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 97dd92b..f81d688 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7907,7 +7907,8 @@ void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCell
}
}
-void SAL_CALL ScTableSheetObj::clearOutline() throw(uno::RuntimeException)
+void SAL_CALL ScTableSheetObj::clearOutline()
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
commit c052deac30a0f19a15f0eb6a26c48f55b534c657
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 25 20:15:25 2014 +0000
coverity#1158351 Uncaught exception
Change-Id: I8549a8fe7cbb262712c5a4996802a8c724ea3645
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 902f443..07813c7 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1179,7 +1179,8 @@ public:
std::exception);
virtual void SAL_CALL clearOutline() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL hideDetail( const ::com::sun::star::table::CellRangeAddress& aRange )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL showDetail( const ::com::sun::star::table::CellRangeAddress& aRange )
throw(::com::sun::star::uno::RuntimeException,
std::exception);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 711c773..97dd92b 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7920,7 +7920,7 @@ void SAL_CALL ScTableSheetObj::clearOutline() throw(uno::RuntimeException)
}
void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellRange )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
More information about the Libreoffice-commits
mailing list