include/svx/unoshape.hxx | 3 -
sc/source/filter/excel/xestream.cxx | 2
sc/source/filter/inc/xestream.hxx | 2
sd/source/filter/eppt/epptooxml.hxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 64 ++++++++++++-------------------
svx/source/unodraw/unoshape.cxx | 7 ---
sw/source/core/access/acctable.cxx | 4 -
sw/source/core/attr/format.cxx | 2
sw/source/core/doc/tblrwcl.cxx | 15 -------
sw/source/core/unocore/unoparagraph.cxx | 4 -
sw/source/ui/vba/vbafield.cxx | 3 -
sw/source/ui/vba/vbafield.hxx | 3 -
13 files changed, 42 insertions(+), 71 deletions(-)
New commits:
commit 3daa47e87ad8c51a84750676ca9b9932390dbdcf
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 11:02:12 2014 +0100
coverity#704291 Logically dead code
Change-Id: Icfdb7178ea89f2a3bd9680cf1b2c017b5058bb83
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index d35a88d..a071150 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2165,7 +2165,7 @@ void AnimationImporter::importCommandContainer( const
Atom* pAtom, const Referen
DBG_ASSERT( pAtom && pAtom->getType() == DFF_msofbtAnimCommand &&
xCommand.is(), "invalid call to
ppt::AnimationImporter::importCommandContainer()!");
if( pAtom && xCommand.is() )
{
- sal_Int32 nBits = 0, nType = 0;
+ sal_Int32 nBits = 0;
Any aValue;
const Atom* pChildAtom = pAtom->findFirstChildAtom();
@@ -2230,47 +2230,33 @@ void AnimationImporter::importCommandContainer( const
Atom* pAtom, const Referen
NamedValue aParamValue;
- switch( nType )
+ if ( aParam == "onstopaudio" )
{
- case 0: // event
- case 1: // call
- if ( aParam == "onstopaudio" )
- {
- nCommand = EffectCommands::STOPAUDIO;
- }
- else if ( aParam == "play" )
- {
- nCommand = EffectCommands::PLAY;
- }
- else if( aParam.startsWith( "playFrom" ) )
- {
- const OUString aMediaTime( aParam.copy( 9,
aParam.getLength() - 10 ) );
- rtl_math_ConversionStatus eStatus;
- double fMediaTime = ::rtl::math::stringToDouble(
aMediaTime, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL );
- if( eStatus == rtl_math_ConversionStatus_Ok )
- {
- aParamValue.Name = "MediaTime";
- aParamValue.Value <<= fMediaTime;
- }
- nCommand = EffectCommands::PLAY;
- }
- else if ( aParam == "togglePause" )
- {
- nCommand = EffectCommands::TOGGLEPAUSE;
- }
- else if ( aParam == "stop" )
- {
- nCommand = EffectCommands::STOP;
- }
- break;
- case 2: // verb
+ nCommand = EffectCommands::STOPAUDIO;
+ }
+ else if ( aParam == "play" )
+ {
+ nCommand = EffectCommands::PLAY;
+ }
+ else if( aParam.startsWith( "playFrom" ) )
+ {
+ const OUString aMediaTime( aParam.copy( 9, aParam.getLength()
- 10 ) );
+ rtl_math_ConversionStatus eStatus;
+ double fMediaTime = ::rtl::math::stringToDouble( aMediaTime,
(sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL );
+ if( eStatus == rtl_math_ConversionStatus_Ok )
{
- aParamValue.Name = "Verb";
- aParamValue.Value <<= aParam.toInt32();
-
- nCommand = EffectCommands::VERB;
+ aParamValue.Name = "MediaTime";
+ aParamValue.Value <<= fMediaTime;
}
- break;
+ nCommand = EffectCommands::PLAY;
+ }
+ else if ( aParam == "togglePause" )
+ {
+ nCommand = EffectCommands::TOGGLEPAUSE;
+ }
+ else if ( aParam == "stop" )
+ {
+ nCommand = EffectCommands::STOP;
}
xCommand->setCommand( nCommand );
commit 4df99bdc5b4a10c9904c2ac792f9c08152419a8e
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 10:58:02 2014 +0100
coverity#704352 Logically dead code
Change-Id: I97cc143071951bc24b8b0f9c6780e40a3b2bdc61
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 90a7e72..45a9fcc 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -4255,22 +4255,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox,
sal_uInt16 eType,
{
// First test if we have room at all
if( bBigger )
- {
bRet = true;
-// What's up with Top, Table in a Frame or Header/Footer with fixed width??
- if( !bRet )
- {
- // Then call itself recursively; only with another
mode (proportional)
- TblChgMode eOld = eTblChgMode;
- eTblChgMode = TBLFIX_CHGPROP;
-
- bRet = SetRowHeight( rAktBox, eType, nAbsDiff,
- nRelDiff, ppUndo );
-
- eTblChgMode = eOld;
- return bRet;
- }
- }
else
bRet = (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
nAbsDiff, true );
commit 2a88ab6642dd7d42eff651a0ac9d9d9428a7fc00
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 10:44:53 2014 +0100
coverity#1194889 Unchecked return value
Change-Id: Ibbca3f2e06cd3eb34dc5477c5dfe4261f4cc4a9a
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 2c5c01a..ded0649 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -111,7 +111,7 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
aNew( *aSet.GetPool(), aSet.GetRanges() );
aSet.Intersect_BC( rFmt.aSet, &aOld, &aNew );
- aSet.Put_BC( rFmt.aSet, &aOld, &aNew );
+ (void)aSet.Put_BC( rFmt.aSet, &aOld, &aNew );
// a few special treatments for attributes
aSet.SetModifyAtAttr( this );
commit ef4623bb58ef3b24f448dc7d1acd4d53c9c2a5e2
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 10:41:39 2014 +0100
coverity#1194931 Uncaught exception
Change-Id: I3ecfce8289e1dec8cfb42ebde990a3119c370986
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index ee593bc..d6c0877 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -347,7 +347,8 @@ SwVbaFields::Add( const css::uno::Reference<
::ooo::vba::word::XRange >& Range,
return uno::Reference< word::XField >( new SwVbaField( mxParent,
mxContext, uno::Reference< text::XTextDocument >( mxModel, uno::UNO_QUERY_THROW
), uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) );
}
-uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const
OUString& _text ) throw (uno::RuntimeException)
+uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const
OUString& _text )
+ throw (uno::RuntimeException, script::BasicErrorException)
{
uno::Reference< text::XTextField > xTextField(
mxMSF->createInstance("com.sun.star.text.TextField.FileName"),
uno::UNO_QUERY_THROW );
sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT;
diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx
index 7a872d0..24bc643 100644
--- a/sw/source/ui/vba/vbafield.hxx
+++ b/sw/source/ui/vba/vbafield.hxx
@@ -49,7 +49,8 @@ class SwVbaFields : public SwVbaFields_BASE
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF;
private:
- css::uno::Reference< css::text::XTextField > Create_Field_FileName( const
OUString& _text ) throw (css::uno::RuntimeException);
+ css::uno::Reference< css::text::XTextField > Create_Field_FileName(const
OUString& rText)
+ throw (css::uno::RuntimeException, css::script::BasicErrorException);
css::uno::Reference< css::text::XTextField > Create_Field_DocProperty(
const OUString& _text ) throw (css::uno::RuntimeException);
public:
commit 4d8282962b6fa2c44ed63df9130e2a6c27fb9576
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 10:36:37 2014 +0100
coverity#1194933 Uncaught exception
Change-Id: Ibb9782cb7e446814387c8635b182058a4bef2a1e
diff --git a/sw/source/core/unocore/unoparagraph.cxx
b/sw/source/core/unocore/unoparagraph.cxx
index 86785fb..76a35f5 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -94,7 +94,7 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
const SwAttrSet** ppSet,
const SfxItemPropertySimpleEntry& rEntry,
sal_Bool &rAttrSetFetched )
- throw (beans::UnknownPropertyException);
+ throw (beans::UnknownPropertyException, uno::RuntimeException,
std::exception);
/******************************************************************
* SwXParagraph
@@ -853,7 +853,7 @@ static beans::PropertyState
lcl_SwXParagraph_getPropertyState(
const SwAttrSet** ppSet,
const SfxItemPropertySimpleEntry& rEntry,
sal_Bool &rAttrSetFetched )
-throw (beans::UnknownPropertyException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException,
std::exception)
{
beans::PropertyState eRet = beans::PropertyState_DEFAULT_VALUE;
commit 6c72f4417a0f354b8c490ca6d95246b897b7d989
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 10:34:55 2014 +0100
coverity#1194934 Uncaught exception
Change-Id: Ifab8abb0fe712b8593abe72ff8cab3bd336d6b09
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index e092c50..5a48df4 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -120,7 +120,7 @@ public:
const SwFrm *GetCell( sal_Int32 nRow, sal_Int32 nColumn, sal_Bool bExact,
SwAccessibleTable *pThis ) const
- throw(lang::IndexOutOfBoundsException );
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
std::exception);
const SwFrm *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop,
sal_Bool bExact ) const;
inline sal_Int32 GetRowCount() const;
@@ -421,7 +421,7 @@ void SwAccessibleTableData_Impl::GetSelection(
const SwFrm *SwAccessibleTableData_Impl::GetCell(
sal_Int32 nRow, sal_Int32 nColumn, sal_Bool,
SwAccessibleTable *pThis ) const
- throw(lang::IndexOutOfBoundsException )
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
std::exception)
{
CheckRowAndCol( nRow, nColumn, pThis );
commit bcb6362ccc6d4b2f1395ce51d34c8e41c48f2cf9
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 10:32:13 2014 +0100
coverity#1194938 Uncaught exception
also coverity#1194935 coverity#1194936 and coverity#1194937
Change-Id: I996ffcf97f72e5695147b61927956643340e80fc
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 153e193..54a784c 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -186,7 +186,8 @@ public:
const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; }
SdrObject* GetSdrObject() const {return mpObj.get();}
void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; }
- ::com::sun::star::uno::Any GetBitmap( bool bMetaFile = false ) const throw
();
+ ::com::sun::star::uno::Any GetBitmap( bool bMetaFile = false ) const
+ throw (css::uno::RuntimeException, std::exception);
::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier();
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 008cb8d..c6b830f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -672,9 +672,8 @@ void SvxShape::ObtainSettingsFromPropertySet(const
SvxItemPropertySet& rPropSet)
}
}
-
-
-uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const throw()
+uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
+ throw (uno::RuntimeException, std::exception)
{
DBG_TESTSOLARMUTEX();
uno::Any aAny;
@@ -725,8 +724,6 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */
) const throw()
return aAny;
}
-
-
uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes()
throw (uno::RuntimeException, std::exception)
{
commit 919187cbcc5d301c3c7f80fa0ff8cd5462dcc155
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 10:24:21 2014 +0100
coverity#1194939 Uncaught exception
Change-Id: I679b494c7c563a776da7ee891c0f4e92926fcfe4
diff --git a/sd/source/filter/eppt/epptooxml.hxx
b/sd/source/filter/eppt/epptooxml.hxx
index 6f4fa03..519db4d 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -71,7 +71,7 @@ public:
// from FilterBase
virtual bool importDocument() throw() SAL_OVERRIDE;
- virtual bool exportDocument() throw() SAL_OVERRIDE;
+ virtual bool exportDocument() throw (std::exception) SAL_OVERRIDE;
// only needed for import, leave them empty, refactor later XmlFilterBase
to export and import base?
virtual sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const
{ return 0; }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 9cab5ad..4ba1fd9 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -329,7 +329,7 @@ bool PowerPointExport::importDocument() throw()
return false;
}
-bool PowerPointExport::exportDocument() throw()
+bool PowerPointExport::exportDocument() throw (std::exception)
{
DrawingML::ResetCounters();
maShapeMap.clear ();
commit 43155517de4670c35b98fb4df5f94217685f8d70
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 31 10:23:09 2014 +0100
coverity#1194940 Uncaught exception
Change-Id: Ibb1b15604e5129c48ca8be4af24dbcfd908ded2f
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index e30a39a..d5bf89d 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1056,7 +1056,7 @@ ScDocShell* XclExpXmlStream::getDocShell()
return 0;
}
-bool XclExpXmlStream::exportDocument() throw()
+bool XclExpXmlStream::exportDocument() throw(std::exception)
{
ScDocShell* pShell = getDocShell();
ScDocument* pDoc = pShell->GetDocument();
diff --git a/sc/source/filter/inc/xestream.hxx
b/sc/source/filter/inc/xestream.hxx
index 2d1d3ae..2ccc15e 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -324,7 +324,7 @@ public:
OUString* pRelationshipId = NULL );
// ignore
- virtual bool exportDocument() throw() SAL_OVERRIDE;
+ virtual bool exportDocument() throw (std::exception) SAL_OVERRIDE;
// only needed for import; ignore
virtual bool importDocument() throw() SAL_OVERRIDE;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
