basctl/source/accessibility/accessibledialogcontrolshape.cxx | 14 - basctl/source/dlged/dlgedobj.cxx | 2 basctl/source/inc/accessibledialogcontrolshape.hxx | 2 basctl/source/inc/dlgedobj.hxx | 2 chart2/source/controller/inc/GraphicPropertyItemConverter.hxx | 2 chart2/source/controller/inc/ItemConverter.hxx | 2 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 2 chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 2 editeng/source/uno/unonrule.cxx | 4 filter/source/msfilter/msdffimp.cxx | 89 ++++++---- filter/source/svg/svgexport.cxx | 18 +- filter/source/svg/svgfilter.hxx | 1 framework/source/uiconfiguration/imagemanagerimpl.cxx | 5 framework/source/uiconfiguration/imagemanagerimpl.hxx | 2 include/comphelper/accessiblecomponenthelper.hxx | 2 include/editeng/unonrule.hxx | 3 include/oox/ppt/dgmimport.hxx | 2 include/svx/svdmodel.hxx | 2 include/svx/unoshape.hxx | 10 - offapi/com/sun/star/packages/zip/XZipFileAccess.idl | 6 oox/source/ppt/dgmimport.cxx | 2 package/inc/zipfileaccess.hxx | 3 package/source/zippackage/zipfileaccess.cxx | 2 reportdesign/source/ui/inc/ScrollHelper.hxx | 2 reportdesign/source/ui/report/ScrollHelper.cxx | 3 starmath/inc/unomodel.hxx | 4 starmath/source/unomodel.cxx | 4 svl/source/numbers/zformat.cxx | 6 svtools/source/graphic/graphicunofactory.cxx | 4 svx/source/inc/svdoutlinercache.hxx | 7 svx/source/svdraw/svdmodel.cxx | 11 + svx/source/svdraw/svdoutlinercache.cxx | 2 svx/source/unodraw/unoshap2.cxx | 5 svx/source/unodraw/unoshap4.cxx | 2 svx/source/unodraw/unoshape.cxx | 8 sw/inc/unoframe.hxx | 2 sw/inc/unosett.hxx | 2 sw/source/core/access/acccontext.cxx | 2 sw/source/core/access/acccontext.hxx | 2 sw/source/core/unocore/unoframe.cxx | 2 sw/source/core/unocore/unosett.cxx | 2 sw/source/core/unocore/unostyle.cxx | 3 sw/source/filter/ww8/rtfattributeoutput.cxx | 12 - sw/source/filter/ww8/ww8par.cxx | 13 + ucb/source/ucp/gio/gio_content.cxx | 4 vcl/generic/print/text_gfx.cxx | 12 - vcl/headless/svpinst.cxx | 2 vcl/inc/generic/printergfx.hxx | 2 vcl/workben/icontest.cxx | 12 - 49 files changed, 191 insertions(+), 118 deletions(-)
New commits: commit 5bdfa8c12472eb9ff6ca054c2ada7150b1869fff Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 15:03:34 2014 +0100 Resolves: fdo#62682 crash on second export of svg because the first export has left "dangling" CalcFieldValueHdl Links in Outliners that got created based on the Drawing Outliner while it had a temporary CalcFieldValueHdl installed, and didn't get the old CalcFieldValueHdl installed when the old Drawing Outliner one was re-installed. Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883 diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 02c3136..7a1f4e8 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -602,7 +602,8 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) SdrOutliner& rOutl = mpSdrModel->GetDrawOutliner(NULL); maOldFieldHdl = rOutl.GetCalcFieldValueHdl(); - rOutl.SetCalcFieldValueHdl( LINK( this, SVGFilter, CalcFieldHdl) ); + maNewFieldHdl = LINK(this, SVGFilter, CalcFieldHdl); + rOutl.SetCalcFieldValueHdl(maNewFieldHdl); } } bRet = implExportDocument(); @@ -615,7 +616,20 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) } if( mpSdrModel ) - mpSdrModel->GetDrawOutliner( NULL ).SetCalcFieldValueHdl( maOldFieldHdl ); + { + //fdo#62682 The maNewFieldHdl can end up getting copied + //into various other outliners which live past this + //method, so get the full list of outliners and restore + //the maOldFieldHdl for all that have ended up using + //maNewFieldHdl + std::vector<SdrOutliner*> aOutliners(mpSdrModel->GetActiveOutliners()); + for (auto aIter = aOutliners.begin(); aIter != aOutliners.end(); ++aIter) + { + SdrOutliner* pOutliner = *aIter; + if (maNewFieldHdl == pOutliner->GetCalcFieldValueHdl()) + pOutliner->SetCalcFieldValueHdl(maOldFieldHdl); + } + } delete mpSVGWriter, mpSVGWriter = NULL; mpSVGExport = NULL; // pointed object is released by xSVGExport dtor at the end of this scope diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 4288472..c0df48b 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -247,6 +247,7 @@ private: XDrawPageSequence mMasterPageTargets; Link maOldFieldHdl; + Link maNewFieldHdl; bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 3be9def..35ab20f 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -232,6 +232,8 @@ public: sal_uIntPtr nSwapGraphicsMode; SdrOutlinerCache* mpOutlinerCache; + //get a vector of all the SdrOutliner belonging to the model + std::vector<SdrOutliner*> GetActiveOutliners() const; SdrModelImpl* mpImpl; sal_uInt16 mnCharCompressType; sal_uInt16 mnHandoutPageCount; diff --git a/svx/source/inc/svdoutlinercache.hxx b/svx/source/inc/svdoutlinercache.hxx index 6dbf728..03572fc 100644 --- a/svx/source/inc/svdoutlinercache.hxx +++ b/svx/source/inc/svdoutlinercache.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SVX_SOURCE_INC_SVDOUTLINERCACHE_HXX #include <sal/types.h> +#include <vector> class SdrModel; class SdrOutliner; @@ -33,12 +34,18 @@ private: SdrOutliner* mpModeOutline; SdrOutliner* mpModeText; + + std::vector<SdrOutliner*> maActiveOutliners; public: SdrOutlinerCache( SdrModel* pModel ); ~SdrOutlinerCache(); SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); + std::vector<SdrOutliner*> GetActiveOutliners() const + { + return maActiveOutliners; + } }; #endif diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 8a46865..409f5c9 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1918,6 +1918,17 @@ SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode ) return mpOutlinerCache->createOutliner( nOutlinerMode ); } +std::vector<SdrOutliner*> SdrModel::GetActiveOutliners() const +{ + std::vector<SdrOutliner*> aRet(mpOutlinerCache ? + mpOutlinerCache->GetActiveOutliners() : std::vector<SdrOutliner*>()); + + aRet.push_back(pDrawOutliner); + aRet.push_back(pHitTestOutliner); + + return aRet; +} + void SdrModel::disposeOutliner( SdrOutliner* pOutliner ) { if( mpOutlinerCache ) diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx index e969798..c852668 100644 --- a/svx/source/svdraw/svdoutlinercache.cxx +++ b/svx/source/svdraw/svdoutlinercache.cxx @@ -48,6 +48,7 @@ SdrOutliner* SdrOutlinerCache::createOutliner( sal_uInt16 nOutlinerMode ) pOutliner = SdrMakeOutliner( nOutlinerMode, mpModel ); Outliner& aDrawOutliner = mpModel->GetDrawOutliner(); pOutliner->SetCalcFieldValueHdl( aDrawOutliner.GetCalcFieldValueHdl() ); + maActiveOutliners.push_back(pOutliner); } return pOutliner; @@ -94,6 +95,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) } else { + maActiveOutliners.erase(std::remove(maActiveOutliners.begin(), maActiveOutliners.end(), pOutliner), maActiveOutliners.end()); delete pOutliner; } } commit 0c1e9111d02649e77513a1d108146c9c055adb3a Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 11:49:42 2014 +0100 coverity#704104 Unchecked return value Change-Id: I4a2c49befe4baea10e36e0d612371fe8c91db401 diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx index 769323b..c97a369 100644 --- a/vcl/generic/print/text_gfx.cxx +++ b/vcl/generic/print/text_gfx.cxx @@ -425,13 +425,18 @@ PrinterGfx::DrawText ( ); } -void PrinterGfx::drawVerticalizedText( +bool PrinterGfx::drawVerticalizedText( const Point& rPoint, const sal_Unicode* pStr, sal_Int16 nLen, const sal_Int32* pDeltaArray ) { + PrintFontManager &rMgr = PrintFontManager::get(); + PrintFontInfo aInfo; + if (!rMgr.getFontInfo(mnFontID, aInfo)) + return false; + sal_Int32* pDelta = (sal_Int32*)alloca( nLen * sizeof(sal_Int32) ); int nTextScale = maVirtualStatus.mnTextWidth ? maVirtualStatus.mnTextWidth : maVirtualStatus.mnTextHeight; @@ -441,10 +446,6 @@ void PrinterGfx::drawVerticalizedText( double fSin = sin( -2.0*M_PI*nNormalAngle/3600 ); double fCos = cos( -2.0*M_PI*nNormalAngle/3600 ); - PrintFontManager &rMgr = PrintFontManager::get(); - PrintFontInfo aInfo; - rMgr.getFontInfo( mnFontID, aInfo ); - bool* pGsubFlags = (bool*)alloca( nLen * sizeof(bool) ); rMgr.hasVerticalSubstitutions( mnFontID, pStr, nLen, pGsubFlags ); @@ -518,6 +519,7 @@ void PrinterGfx::drawVerticalizedText( nLastPos = i; } mnTextAngle = nNormalAngle; + return true; } void diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index c797ea4..a0e2683 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -304,7 +304,7 @@ public: void writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts ); PrintFontManager& GetFontMgr () { return mrFontMgr; } - void drawVerticalizedText (const Point& rPoint, + bool drawVerticalizedText (const Point& rPoint, const sal_Unicode* pStr, sal_Int16 nLen, const sal_Int32* pDeltaArray ); commit 98a19ed06585ffff5dd1887e4a203d619259ee8c Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 11:43:15 2014 +0100 coverity#735341 Unchecked return value from library Change-Id: I8eb5158cb2aa39b5eac45c554d722b9de1c8abe8 diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 3fa2226..4744251 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -334,7 +334,7 @@ void SvpSalInstance::DoReleaseYield( int nTimeoutMS ) // release yield mutex sal_uLong nAcquireCount = ReleaseYieldMutex(); - poll( &aPoll, 1, nTimeoutMS ); + (void)poll( &aPoll, 1, nTimeoutMS ); // acquire yield mutex again AcquireYieldMutex( nAcquireCount ); commit 711e74544d70b108e9bc70772b31f386dbf1c2a4 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 10:27:36 2014 +0100 coverity#1242624 Untrusted loop bound Change-Id: If2ae1982eec100f5602a13d648beec247ced6aa2 diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8336db7..05ac18e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1905,7 +1905,13 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt sal_uInt16 nNumElemMem = 0; rIn.ReadUInt16( nNumElem ).ReadUInt16( nNumElemMem ).ReadUInt16( nElemSize ); } - if ( nElemSize == 36 ) + bool bImport = false; + if (nElemSize == 36) + { + //sanity check that the stream is long enough to fulfill nNumElem * nElemSize; + bImport = rIn.remainingSize() / nElemSize >= nNumElem; + } + if (bImport) { uno::Sequence< beans::PropertyValues > aHandles( nNumElem ); for ( sal_uInt16 i = 0; i < nNumElem; i++ ) @@ -2317,12 +2323,19 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt sal_uInt16 nNumElemMem = 0; rIn.ReadUInt16( nNumElem ).ReadUInt16( nNumElemMem ).ReadUInt16( nElemSize ); } - if ( nElemSize == 16 ) + bool bImport = false; + if (nElemSize == 16) + { + //sanity check that the stream is long enough to fulfill nNumElem * nElemSize; + bImport = rIn.remainingSize() / nElemSize >= nNumElem; + } + if (bImport) { - sal_Int32 nLeft, nTop, nRight, nBottom; com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aTextFrames( nNumElem ); - for ( sal_uInt16 i = 0; i < nNumElem; i++ ) + for (sal_uInt16 i = 0; i < nNumElem; ++i) { + sal_Int32 nLeft(0), nTop(0), nRight(0), nBottom(0); + rIn.ReadInt32( nLeft ) .ReadInt32( nTop ) .ReadInt32( nRight ) @@ -2350,26 +2363,37 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt if ( SeekToContent( DFF_Prop_connectorPoints, rIn ) ) rIn.ReadUInt16( nNumElemVert ).ReadUInt16( nNumElemMemVert ).ReadUInt16( nElemSizeVert ); - sal_Int32 nX, nY; - sal_Int16 nTmpA, nTmpB; - aGluePoints.realloc( nNumElemVert ); - for ( sal_uInt16 i = 0; i < nNumElemVert; i++ ) + bool bImport = false; + if (nNumElemVert) { - if ( nElemSizeVert == 8 ) - { - rIn.ReadInt32( nX ) - .ReadInt32( nY ); - } - else + //sanity check that the stream is long enough to fulfill nNumElemVert * nElemSizeVert; + bImport = rIn.remainingSize() / nElemSizeVert >= nNumElemVert; + } + + if (bImport) + { + aGluePoints.realloc( nNumElemVert ); + for (sal_uInt16 i = 0; i < nNumElemVert; ++i) { - rIn.ReadInt16( nTmpA ) - .ReadInt16( nTmpB ); + sal_Int32 nX(0), nY(0); + if ( nElemSizeVert == 8 ) + { + rIn.ReadInt32( nX ) + .ReadInt32( nY ); + } + else + { + sal_Int16 nTmpA(0), nTmpB(0); - nX = nTmpA; - nY = nTmpB; + rIn.ReadInt16( nTmpA ) + .ReadInt16( nTmpB ); + + nX = nTmpA; + nY = nTmpB; + } + EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( aGluePoints[ i ].First, nX ); + EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( aGluePoints[ i ].Second, nY ); } - EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( aGluePoints[ i ].First, nX ); - EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( aGluePoints[ i ].Second, nY ); } const OUString sGluePoints( "GluePoints" ); aProp.Name = sGluePoints; commit a4e0107000f26ab56147bf382bb399bcb0981504 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 10:14:28 2014 +0100 coverity#1242604 attempt to silence Untrusted loop bound Change-Id: I034fa25671cce8ba215d7b8b88f0dff5b26d40cb diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 983b075..aa877b8 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -528,8 +528,10 @@ void ImpSvNumFor::SaveNewCurrencyMap( SvStream& rStream ) const void ImpSvNumFor::LoadNewCurrencyMap( SvStream& rStream ) { sal_uInt16 nCnt; - rStream.ReadUInt16( nCnt ); - for ( sal_uInt16 j=0; j<nCnt; j++ ) + rStream.ReadUInt16(nCnt); + if (!nCnt) + return; + for (sal_uInt16 j=0; j < nCnt; ++j) { sal_uInt16 nPos; short nType; commit cf63ebe0f005513c1e989682459bcd0688eb190b Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 10:06:45 2014 +0100 coverity#1242717 Untrusted loop bound Change-Id: I983bba075ab9626c90555fa41f9d473ae60fafea diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index fdb4898..8336db7 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1066,14 +1066,20 @@ void GetShadeColors( const SvxMSDffManager& rManager, const DffPropertyReader& r sal_uInt32 nPos = rIn.Tell(); if ( rProperties.IsProperty( DFF_Prop_fillShadeColors ) ) { - if ( rProperties.SeekToContent( DFF_Prop_fillShadeColors, rIn ) ) + sal_uInt16 i = 0, nNumElem = 0, nNumElemReserved = 0, nSize = 0; + bool bOk = false; + if (rProperties.SeekToContent(DFF_Prop_fillShadeColors, rIn)) { - sal_uInt16 i = 0, nNumElem = 0, nNumElemReserved = 0, nSize = 0; rIn.ReadUInt16( nNumElem ).ReadUInt16( nNumElemReserved ).ReadUInt16( nSize ); + //sanity check that the stream is long enough to fulfill nNumElem * 2 sal_Int32s + bOk = rIn.remainingSize() / (2*sizeof(sal_Int32)) >= nNumElem; + } + if (bOk) + { for ( ; i < nNumElem; i++ ) { - sal_Int32 nColor; - sal_Int32 nDist; + sal_Int32 nColor(0); + sal_Int32 nDist(0); rIn.ReadInt32( nColor ).ReadInt32( nDist ); rShadeColors.push_back( ShadeColor( rManager.MSO_CLR_ToColor( nColor, DFF_Prop_fillColor ), 1.0 - ( nDist / 65536.0 ) ) ); commit bbe264a19fb82f50d859fc72a47312db0527640f Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 10:03:32 2014 +0100 coverity#1242724 Untrusted value as argument Change-Id: I6041d09ef0a4ed4af5f1bf93f31a1eac60be1af7 diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index fe65386..fdb4898 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5318,19 +5318,24 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, { delete pTextImpRec->pWrapPolygon; pTextImpRec->pWrapPolygon = NULL; - sal_uInt16 nNumElemVert, nNumElemMemVert, nElemSizeVert; + sal_uInt16 nNumElemVert(0), nNumElemMemVert(0), nElemSizeVert(0); rSt.ReadUInt16( nNumElemVert ).ReadUInt16( nNumElemMemVert ).ReadUInt16( nElemSizeVert ); + bool bOk = false; if (nNumElemVert && ((nElemSizeVert == 8) || (nElemSizeVert == 4))) { + bOk = rSt.remainingSize() / nElemSizeVert >= nNumElemVert; + } + if (bOk) + { pTextImpRec->pWrapPolygon = new Polygon(nNumElemVert); for (sal_uInt16 i = 0; i < nNumElemVert; ++i) { - sal_Int32 nX, nY; + sal_Int32 nX(0), nY(0); if (nElemSizeVert == 8) rSt.ReadInt32( nX ).ReadInt32( nY ); else { - sal_Int16 nSmallX, nSmallY; + sal_Int16 nSmallX(0), nSmallY(0); rSt.ReadInt16( nSmallX ).ReadInt16( nSmallY ); nX = nSmallX; nY = nSmallY; commit be31503ef86d2ad3291ced8fddb9c4da4d324c46 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 10:01:45 2014 +0100 coverity#1242778 Untrusted value as argument Change-Id: I34d5a5e7c5f0eef51d941c65ab73d5421d5a36cb diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 555aa16..c162f75 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1043,19 +1043,26 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, delete pImpRec->pWrapPolygon; pImpRec->pWrapPolygon = NULL; - sal_uInt16 nNumElemVert, nNumElemMemVert, nElemSizeVert; + sal_uInt16 nNumElemVert(0), nNumElemMemVert(0), nElemSizeVert(0); rSt.ReadUInt16( nNumElemVert ).ReadUInt16( nNumElemMemVert ).ReadUInt16( nElemSizeVert ); + bool bOk = false; if (nNumElemVert && ((nElemSizeVert == 8) || (nElemSizeVert == 4))) { + //check if there is enough data in the file to make the + //record sane + bOk = rSt.remainingSize() / nElemSizeVert >= nNumElemVert; + } + if (bOk) + { pImpRec->pWrapPolygon = new Polygon(nNumElemVert); for (sal_uInt16 i = 0; i < nNumElemVert; ++i) { - sal_Int32 nX, nY; + sal_Int32 nX(0), nY(0); if (nElemSizeVert == 8) rSt.ReadInt32( nX ).ReadInt32( nY ); else { - sal_Int16 nSmallX, nSmallY; + sal_Int16 nSmallX(0), nSmallY(0); rSt.ReadInt16( nSmallX ).ReadInt16( nSmallY ); nX = nSmallX; nY = nSmallY; commit b520fca88d29bb130115224317bf6b627b5a7c54 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:52:45 2014 +0100 coverity#1247647 Uncaught exception Change-Id: I1e47f3970f944aa3556e4ddb9b7918d9ee23c0eb diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index 0310add..adf598e 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -58,7 +58,7 @@ protected: virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 4d3e215..e2623c3 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -148,7 +148,7 @@ protected: The default implementation does nothing except showing an assertion */ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw (css::uno::Exception, std::exception); /** for items that can not be mapped directly to a property. diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 565aafd..a513e99 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -234,7 +234,7 @@ bool GraphicPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tProp void GraphicPropertyItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) + throw (uno::Exception, std::exception) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 1e0e5a5..9574f36 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -150,7 +150,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void ItemConverter::FillSpecialItem( sal_uInt16 /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const - throw( uno::Exception ) + throw (uno::Exception, std::exception) { OSL_FAIL( "ItemConverter: Unhandled special item found!" ); } commit f5b1b266bc0164b0c69a7c36bb1deed0e451efce Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:50:41 2014 +0100 coverity#1247646 Uncaught exception Change-Id: I332fb602466613e9e79ba4510879411e0bee9da6 diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 75dd5f8..3454591 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -238,31 +238,19 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateS rStateSet.AddState( AccessibleStateType::RESIZABLE ); } - // OCommonAccessibleComponent - - -awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException) +awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException, std::exception) { return GetBounds(); } - // XInterface - - IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogControlShape, AccessibleExtendedComponentHelper_BASE, AccessibleDialogControlShape_BASE ) - // XTypeProvider - - IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogControlShape, AccessibleExtendedComponentHelper_BASE, AccessibleDialogControlShape_BASE ) - // XComponent - - void AccessibleDialogControlShape::disposing() { AccessibleExtendedComponentHelper_BASE::disposing(); diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index bd0fa26..c0e6674 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -81,7 +81,7 @@ protected: virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index 520ce81..b5c7827 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -47,7 +47,7 @@ namespace comphelper protected: /// implements the calculation of the bounding rectangle - still waiting to be overwritten - virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException, std::exception) = 0; protected: /** non-virtual versions of the methods which can be implemented using <method>implGetBounds</method> commit fc0e506d649481e96b8930f3d9594eefc3323196 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:49:05 2014 +0100 coverity#1247645 Uncaught exception Change-Id: Id6596945d51a1b9f8750aa0f46f6a061cb2e80c3 diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index 02c35ad..b7edb38 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -59,7 +59,7 @@ class SmModel : public SfxBaseModel, SmPrintUIOptions* m_pPrintUIOptions; protected: virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) - throw( css::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; public: diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 3b93bd2..591c1f2 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -433,7 +433,7 @@ uno::Sequence< OUString > SmModel::getSupportedServiceNames_Static(void) } void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pValues) - throw( RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException) + throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception) { SolarMutexGuard aGuard; commit d4cdaa2ad69fbee6569d82bdcd0d7deb357bb4db Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:47:46 2014 +0100 coverity#1247644 Uncaught exception Change-Id: Idbaef5c196c29a2e066f667e6bd50189a7b1834c diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index cd837a4..aaf54b5 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -1121,7 +1121,7 @@ void DlgEdObj::EndListening(bool bRemoveListener) } } -void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException, std::exception) { if (isListening()) { diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index c980eec..5898c37 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -121,7 +121,7 @@ public: virtual void SAL_CALL TabIndexChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException); // PropertyChangeListener - virtual void SAL_CALL _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ContainerListener virtual void SAL_CALL _elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); commit d63f917d31ea0f61ab223881a0a76e9e2a888087 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:46:33 2014 +0100 coverity#1247643 Uncaught exception Change-Id: I0da9140bf1f76a92c95c042c5039f7cfdbde6c34 diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 61df408..b0d2679 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -659,7 +659,7 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index a3b791e..6547710 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1410,14 +1410,11 @@ SvxGraphicObject::SvxGraphicObject( SdrObject* pObj, OUString const & referer ) { } - SvxGraphicObject::~SvxGraphicObject() throw() { } - - -bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { bool bOk = false; switch( pProperty->nWID ) commit e04f6bc2e6b564d9580d62c631c012685a7f9f8f Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:45:10 2014 +0100 coverity#1247642 Uncaught exception Change-Id: Ic7ffc47fd84f89029c140d68601971a5a2d58d0a diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index 5bb952f..02c35ad 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -61,7 +61,7 @@ protected: virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw( css::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) - throw( css::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; public: SmModel( SfxObjectShell *pObjSh = 0 ); virtual ~SmModel() throw (); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 7f479fc..3b93bd2 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -718,7 +718,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* } void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValue ) - throw( RuntimeException, UnknownPropertyException, WrappedTargetException ) + throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) { SmDocShell *pDocSh = static_cast < SmDocShell * > (GetObjectShell()); commit 8ba198465a7629d815c25d0ee9bf3cc30ceb2767 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:43:41 2014 +0100 coverity#1247640 Uncaught exception Change-Id: Iccb18ddc9333b7812b747b142272f4394e4eca80 diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index a0126fc..9f7b3bf 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -841,7 +841,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint false: Use absolute mode. */ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 4978929..dcc8c4c 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -185,7 +185,7 @@ protected: virtual ::com::sun::star::awt::Rectangle SAL_CALL getBoundsImpl(bool bRelative) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // #i85634# inline void NotRegisteredAtAccessibleMap() commit b3644b6a7015d37668b8b64cdce1d33b6da5b806 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:35:30 2014 +0100 coverity#1247639 Uncaught exception Change-Id: I5d91a6b7e4a539ea64b42d747a5fc142b36306dc diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index d1315ca..4035aa2 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -70,7 +70,7 @@ namespace rptui virtual void Resize() SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: OScrollWindowHelper( ODesignView* _pReportDesignView); virtual ~OScrollWindowHelper(); diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 5db2bf0..0fc0531 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -362,7 +362,8 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) } } -void OScrollWindowHelper::_propertyChanged(const beans::PropertyChangeEvent& /*_rEvent*/) throw( uno::RuntimeException) +void OScrollWindowHelper::_propertyChanged(const beans::PropertyChangeEvent& /*_rEvent*/) + throw (uno::RuntimeException, std::exception) { m_aReportWindow.notifySizeChanged(); } commit 6bb741b7f4cc29c479158a816a47303ce152d74e Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:33:32 2014 +0100 coverity#1247638 Uncaught exception Change-Id: Ibdda31c2a8d8c3314173f381b60800ccfbcc25f7 diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index e9729ee..61df408 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -160,7 +160,7 @@ protected: void endSetPropertyValues(); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); @@ -328,7 +328,7 @@ protected: protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; @@ -568,7 +568,7 @@ class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void resetModifiedState(); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 33c6e1f..cf04023 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2122,9 +2122,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope return eState; } - - -bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -4116,7 +4114,7 @@ void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::Runt } // overide these for special property handling in subcasses. Return true if property is handled -bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // HACK-fix #99090# // since SdrTextObj::SetVerticalWriting exchanges diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index a8e0b50..93d0ca4 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -195,7 +195,7 @@ public: GetNumberingRuleByIndex(const SwNumRule& rNumRule, sal_Int32 nIndex)const; void SetNumberingRuleByIndex(SwNumRule& rNumRule, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties, sal_Int32 nIndex) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); const OUString* GetNewCharStyleNames() const {return m_sNewCharStyleNames;} const OUString* GetBulletFontNames() const {return m_sNewBulletFontNames;} diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 0b63cef..10693c0 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1589,7 +1589,7 @@ static PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rProp void SwXNumberingRules::SetNumberingRuleByIndex( SwNumRule& rNumRule, const uno::Sequence<beans::PropertyValue>& rProperties, sal_Int32 nIndex) - throw( uno::RuntimeException, lang::IllegalArgumentException ) + throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; OSL_ENSURE( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" ); commit 3e6ff5ed37d810e732994a983afa25f9a0ac3901 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:32:25 2014 +0100 coverity#1247637 Uncaught exception Change-Id: I1e3e47b1473bb4b504e94d06b41d1a86a4004e91 diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index b78d362..fc3d1fd 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -87,7 +87,7 @@ SvxOle2Shape::~SvxOle2Shape() throw() } //XPropertySet -bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { commit 79943fac0d49f4deecb1f61ae2e8301ce75173b6 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 11:59:41 2014 +0100 coverity#706591 Uncaught exception Change-Id: I9b705664c3814aea5c433526ad147a8ab11c2d0f diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl index 24cc313..58e7842 100644 --- a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl +++ b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl @@ -23,8 +23,7 @@ #include <com/sun/star/io/XInputStream.idl> #include <com/sun/star/io/IOException.idl> #include <com/sun/star/uno/XInterface.idl> - - +#include <com/sun/star/packages/zip/ZipException.idl> module com { module sun { module star { module packages { module zip { @@ -45,7 +44,8 @@ interface XZipFileAccess: ::com::sun::star::uno::XInterface */ ::com::sun::star::io::XInputStream getStreamByPattern( [in] string aPattern ) raises( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException ); + ::com::sun::star::io::IOException, + ::com::sun::star::packages::zip::ZipException ); }; diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index af3258e..6d3b2d9 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -21,6 +21,7 @@ #define INCLUDED_PACKAGE_INC_ZIPFILEACCESS_HXX #include <com/sun/star/packages/zip/XZipFileAccess2.hpp> +#include <com/sun/star/packages/zip/ZipException.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -81,7 +82,7 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XZipFileAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const OUString& aPattern ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const OUString& aPattern ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, css::packages::zip::ZipException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index c070d83..0efa97d 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -358,7 +358,7 @@ sal_Bool SAL_CALL OZipFileAccess::hasElements() // XZipFileAccess uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( const OUString& aPatternString ) throw ( container::NoSuchElementException, - io::IOException, + io::IOException, packages::zip::ZipException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); commit 0c0c77af0625dd2bf94bd837e8989ed092c3725b Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:30:25 2014 +0100 coverity#1247635 Uncaught exception Change-Id: Ic346a5820102a922f54c971e01587601991bd484 diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 78c4d17..5959a72 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -268,8 +268,8 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal return aSeq; } -void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::PropertyValue >& rProperties, sal_Int32 nIndex) - throw( RuntimeException, IllegalArgumentException ) +void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::PropertyValue >& rProperties, sal_Int32 nIndex) + throw (RuntimeException, IllegalArgumentException, std::exception) { SvxNumberFormat aFmt(maRule.GetLevel( (sal_uInt16)nIndex )); const beans::PropertyValue* pPropArray = rProperties.getConstArray(); diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx index f600b6a..479d450 100644 --- a/include/editeng/unonrule.hxx +++ b/include/editeng/unonrule.hxx @@ -74,7 +74,8 @@ public: // internal com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const throw (css::uno::RuntimeException); - void setNumberingRuleByIndex( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rProperties, sal_Int32 nIndex) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException ); + void setNumberingRuleByIndex(const css::uno::Sequence<css::beans::PropertyValue>& rProperties, sal_Int32 nIndex) + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); static sal_Int16 Compare( const com::sun::star::uno::Any& rAny1, const com::sun::star::uno::Any& rAny2 ); commit b0a91289a0fb40f81af1d3291f1a0f203ce006ca Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:29:01 2014 +0100 coverity#1247634 Uncaught exception Change-Id: I0d7326533a4daf9d4cb37ce73e85c6a089eed33d diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 3270a31..d1b7f14 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1652,7 +1652,8 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, SwDoc* pDoc, SfxStyleFamily eFamily) throw(beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, + std::exception) { //UUUU adapted switch logic to a more readable state; removed goto's and made commit dbfd932e089014e1581016badad15ff124271316 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:28:16 2014 +0100 coverity#1247633 Uncaught exception Change-Id: I4058089f45b39ddacc56ccf2259ce6e939abe4ee diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index fe3ed7b..8240b55 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -39,7 +39,7 @@ class GObjectImpl : public GObjectAccess_BASE ::osl::Mutex m_aMutex; std::unique_ptr< GraphicObject > mpGObject; public: - GObjectImpl(uno::Sequence< uno::Any > const & args) throw (uno::RuntimeException); + GObjectImpl(uno::Sequence< uno::Any > const & args) throw (uno::RuntimeException, std::exception); // XGraphicObject virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -68,7 +68,7 @@ public: } }; -GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) throw (uno::RuntimeException) +GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) throw (uno::RuntimeException, std::exception) { if ( args.getLength() == 1 ) { commit fabbdc70ad7800ba80826edc3c380bf472718a6e Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:27:25 2014 +0100 coverity#1247632 Uncaught exception Change-Id: I8d6df8c6853f0bd2f0b099d14bf0ac246170e7f1 diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index f4d4e96..3efad8b 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -40,7 +40,7 @@ public: QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // from FilterBase - virtual bool importDocument() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual bool importDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool exportDocument() throw() SAL_OVERRIDE; virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx index dcb80319..a64b576 100644 --- a/oox/source/ppt/dgmimport.cxx +++ b/oox/source/ppt/dgmimport.cxx @@ -55,7 +55,7 @@ QuickDiagrammingImport::QuickDiagrammingImport( const ::com::sun::star::uno::Ref : XmlFilterBase( rxContext ) {} -bool QuickDiagrammingImport::importDocument() throw (css::uno::RuntimeException) +bool QuickDiagrammingImport::importDocument() throw (css::uno::RuntimeException, std::exception) { /* to activate the PPTX dumper, define the environment variable OOO_PPTXDUMPER and insert the full path to the file commit 331f4663e4c50992f8e5f6a9a310073e041377e3 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:25:46 2014 +0100 coverity#1247631 Uncaught exception Change-Id: I92e59b18cef0828040c88ffbde150de6bb0d16a5 diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index d9a012c..f1663a1 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -138,7 +138,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); const SwFrmFmt* GetFrmFmt() const diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 93271c0..d2b6d5a 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2680,7 +2680,7 @@ void SwXFrame::ResetDescriptor() } void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRange) - throw( lang::IllegalArgumentException, uno::RuntimeException ) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsDescriptor()) commit 6e417ffe04d5503da4b9fec56f14c46c785d804f Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:24:07 2014 +0100 coverity#1247630 Uncaught exception Change-Id: Ic15d712a26bdb6565b78efc4e9cab1bb09fd1cf4 diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 2273860..de30d27 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -1102,8 +1102,9 @@ throw ( ::com::sun::star::container::ElementExistException, // XUIConfigurationPersistence void ImageManagerImpl::reload() -throw ( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException ) + throw (css::uno::Exception, + css::uno::RuntimeException, + std::exception) { SolarMutexClearableGuard aGuard; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 93ee508..ea5e47a 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -123,7 +123,7 @@ namespace framework void removeConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); // XUIConfigurationPersistence - void reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + void reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); void store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, commit ef057fc58e7463225a4eda25d84596235965282c Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:21:38 2014 +0100 coverity#1247629 Uncaught exception Change-Id: Ib0f0555ba5630b225a4a5fbc64394becdeb9f7dd diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index cf9b40a..e9729ee 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -209,7 +209,7 @@ public: // access methods for master objects ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 594c86e..33c6e1f 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1641,7 +1641,7 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u } void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; commit 751570534fb5605a26b0d682bf0ad606d4184af1 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:19:12 2014 +0100 coverity#1247636 Uncaught exception Change-Id: If9d635b7345683da0bf6ef7c7b0ffba0450f5dbd diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 96dbd72..2eb2219 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> +#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/ucb/ContentInfoAttribute.hpp> #include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp> @@ -303,7 +303,7 @@ void convertToIOException(GError *pError, const uno::Reference< uno::XInterface catch (const uno::Exception& e) { css::uno::Any a(cppu::getCaughtException()); - throw css::lang::WrappedTargetException( + throw css::lang::WrappedTargetRuntimeException( "wrapped Exception " + e.Message, css::uno::Reference<css::uno::XInterface>(), a); } commit 9ab85c298bee6e702dd78e7746bafde92419081f Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:14:56 2014 +0100 coverity#1247652 Uninitialized scalar field Change-Id: I4760bc63f61d59c51b6557bf0e3364c1fe0e56be diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index 8393977..f9b0709 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -145,8 +145,10 @@ void MyWorkWindow::Paint( const Rectangle& rRect ) Invalidate( INVALIDATE_CHILDREN ); } -MyOpenGLWorkWindow::MyOpenGLWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) : - MyWorkWindow( pParent, nWinStyle ) +MyOpenGLWorkWindow::MyOpenGLWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) + : MyWorkWindow(pParent, nWinStyle) + , mnTextureName(0) + , mnTextureAspect(0) { mbHaveTexture = false; mpOpenGLWindow = new OpenGLWindow( this ); commit 748d94bdbe7cbc4d0e59da17db8a130d9326ea85 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:14:00 2014 +0100 coverity#1247651 Uninitialized pointer field Change-Id: Iff58777cfe8422be90fb59189f98a0f34b0aa102 diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index 4373cd4..8393977 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -95,8 +95,10 @@ public: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; -MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) : - WorkWindow( pParent, nWinStyle ) +MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) + : WorkWindow(pParent, nWinStyle) + , mpBitmap(NULL) + , mpFixedBitmap(NULL) { mnPaintCount = 0; mnStartTime = getTimeNow(); commit c45fa7f54dff30a66ff37fea6d03225d738ca7d3 Author: Caolán McNamara <[email protected]> Date: Fri Oct 17 09:11:57 2014 +0100 coverity#1247648 Uninitialized pointer read Change-Id: Id9faf897cedd976491520178aad8015398f7d018 diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 96c04c6..95c609e 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2350,26 +2350,24 @@ void RtfAttributeOutput::CharRotate(const SvxCharRotateItem& rRotate) void RtfAttributeOutput::CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark) { - const sal_Char* pStr; switch (rEmphasisMark.GetEmphasisMark()) { case EMPHASISMARK_NONE: - pStr = OOO_STRING_SVTOOLS_RTF_ACCNONE; + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCNONE); break; case EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE: - pStr = OOO_STRING_SVTOOLS_RTF_ACCDOT; + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCDOT); break; case EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE: - pStr = OOO_STRING_SVTOOLS_RTF_ACCCOMMA; + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCCOMMA); break; case EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE: - pStr = OOO_STRING_SVTOOLS_RTF_ACCCIRCLE; + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCCIRCLE); break; case EMPHASISMARK_DOT|EMPHASISMARK_POS_BELOW: - pStr = OOO_STRING_SVTOOLS_RTF_ACCUNDERDOT; + m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCUNDERDOT); break; } - m_aStyles.append(pStr); } void RtfAttributeOutput::CharTwoLines(const SvxTwoLinesItem& rTwoLines)
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
