[Libreoffice-commits] core.git: 17 commits - comphelper/source connectivity/source embeddedobj/source filter/source framework/source include/comphelper include/filter include/svx scaddins/source sc/source sd/source svtools/langsupport svx/source
Caolán McNamara
caolanm at redhat.com
Mon Jun 29 04:58:34 PDT 2015
comphelper/source/misc/storagehelper.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/inc/dbase/DTable.hxx | 2
embeddedobj/source/commonembedding/xfactory.cxx | 3 -
embeddedobj/source/commonembedding/xfactory.hxx | 2
filter/source/msfilter/msvbahelper.cxx | 2
framework/source/accelerators/storageholder.cxx | 2
framework/source/uielement/langselectionstatusbarcontroller.cxx | 4 -
include/comphelper/storagehelper.hxx | 2
include/filter/msfilter/msvbahelper.hxx | 2
include/svx/unoapi.hxx | 4 -
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 2
sc/source/ui/inc/AccessibleTableBase.hxx | 2
sc/source/ui/vba/vbaeventshelper.cxx | 2
sc/source/ui/vba/vbaeventshelper.hxx | 2
scaddins/source/analysis/analysis.cxx | 2
scaddins/source/analysis/analysis.hxx | 2
scaddins/source/datefunc/datefunc.cxx | 2
scaddins/source/datefunc/datefunc.hxx | 2
scaddins/source/pricing/pricing.cxx | 2
scaddins/source/pricing/pricing.hxx | 2
sd/source/ui/inc/SdUnoDrawView.hxx | 2
sd/source/ui/inc/unomodel.hxx | 2
sd/source/ui/inc/unopage.hxx | 4 -
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 4 -
svtools/langsupport/langsupport.cxx | 5 ++
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 21 ++++++----
svx/source/unodraw/unoprov.cxx | 8 +--
30 files changed, 54 insertions(+), 43 deletions(-)
New commits:
commit 2d196d0ee26b3840e56ec6537066a3b4a2f08691
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 11:26:41 2015 +0100
Resolves: tdf#92275 impress grinds to a halt constant swapping images
This reverts commit 6c84442f99de109b585d3ba8964deb8dcf261c0f.
"tdf#87820 Images not displayed properly in Calc"
and replaces it with an alternative solution
Change-Id: Iecb560d43767f0e41e442a307eefcdcecb7589ef
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 53fc85d..ebca769 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -134,22 +134,30 @@ namespace sdr
rGrafObj.mbInsidePaint = false;
}
- // Invalidate paint areas.
- GetViewContact().ActionChanged();
-
bRetval = true;
}
}
}
else
{
- // it is not swapped out, somehow it was loaded. In that case, forget
+ // it is not swapped out, somehow[1] it was loaded. In that case, forget
// about an existing triggered event
- if(mpAsynchLoadEvent)
+ if (mpAsynchLoadEvent)
{
// just delete it, this will remove it from the EventHandler and
// will trigger forgetAsynchGraphicLoadingEvent from the destructor
delete mpAsynchLoadEvent;
+
+ // Invalidate paint areas.
+ // [1] If a calc document with graphics is loaded then OnLoad will
+ // be emitted before the graphic are due to be swapped in asynchronously
+ // In sfx2 we generate a preview on receiving onload, which forces
+ // the graphics to be swapped in to generate the preview. When
+ // the timer triggers it find the graphics already swapped in. So
+ // we should still invalidate the paint area on finding the graphic
+ // swapped in seeing as we're still waiting in calc to draw the
+ // graphics on receipt of their contents.
+ GetViewContact().ActionChanged();
}
}
@@ -189,9 +197,6 @@ namespace sdr
rGrafObj.mbInsidePaint = false;
}
- // Invalidate paint areas.
- GetViewContact().ActionChanged();
-
bRetval = true;
}
}
commit 1f2a705bf3a5556c8dc18f5f67a6544747828392
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:38:07 2015 +0100
coverity#1308581 Uncaught exception
Change-Id: I925cc31890c8b1cd5ced0a619fbfde4be0a66dd4
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 009fb67..f77cc5b 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -387,7 +387,7 @@ public:
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// intern
- SdPage* FindPage( const OUString& rName ) const throw();
+ SdPage* FindPage( const OUString& rName ) const throw(std::exception);
};
#endif
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 4940b08..dd71a82 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -3273,7 +3273,7 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasElements()
return mpModel->GetDoc() != NULL;
}
-SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw()
+SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw(std::exception)
{
SdDrawDocument* mpDoc = mpModel->GetDoc();
if( mpDoc == NULL )
commit e632eaecfcd71d8f280ce9142a2ab9966a27bae5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:36:51 2015 +0100
coverity#1308576 Uncaught exception
Change-Id: Ic31670bd8999961dc9571c8d55817951a702d417
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 85ab00c..d6d3047 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -77,7 +77,7 @@ ResMgr& AnalysisAddIn::GetResMgr() throw( uno::RuntimeException, std::exception
return *pResMgr;
}
-OUString AnalysisAddIn::GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( uno::RuntimeException )
+OUString AnalysisAddIn::GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( uno::RuntimeException, std::exception )
{
return AnalysisRscStrLoader( RID_ANALYSIS_FUNCTION_NAMES, nFuncNum, GetResMgr() ).GetString();
}
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index 560ec5d..79cd750 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -63,7 +63,7 @@ private:
sca::analysis::ScaAnyConverter aAnyConv;
ResMgr& GetResMgr() throw( css::uno::RuntimeException, std::exception );
- OUString GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( css::uno::RuntimeException );
+ OUString GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( css::uno::RuntimeException, std::exception );
OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException, std::exception );
void InitDefLocales();
inline const css::lang::Locale& GetLocale( sal_uInt32 nInd );
commit 53bd35aafdcfec740b495db7ed5d48fb8077132c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:35:57 2015 +0100
coverity#1308553 Uncaught exception
Change-Id: I26d41fa888c2426ad8e77a170d9e9eb880ad32df
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index 5d5a68b..3504924 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -68,7 +68,7 @@ protected:
const SvxItemPropertySet* mpPropSet;
virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException, std::exception);
- virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw();
+ virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw(std::exception);
OUString getBookmarkURL() const;
void setBookmarkURL( OUString& rURL );
@@ -235,7 +235,7 @@ private:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence;
protected:
virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE;
- virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw() SAL_OVERRIDE;
+ virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw (std::exception) SAL_OVERRIDE;
public:
SdMasterPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw();
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 60d7287..0455f55 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1527,7 +1527,7 @@ void SdGenericDrawPage::setBackground( const Any& ) throw(lang::IllegalArgumentE
OSL_FAIL( "Don't call me, I'm useless!" );
}
-void SdGenericDrawPage::getBackground( Any& ) throw()
+void SdGenericDrawPage::getBackground( Any& ) throw(std::exception)
{
OSL_FAIL( "Don't call me, I'm useless!" );
}
@@ -2954,7 +2954,7 @@ void SdMasterPage::setBackground( const Any& rValue )
}
}
-void SdMasterPage::getBackground( Any& rValue ) throw()
+void SdMasterPage::getBackground( Any& rValue ) throw (std::exception)
{
if( GetModel() ) try
{
commit c921885cfd7119fcdbec92f4106890d6ce0ad9c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:30:41 2015 +0100
coverity#1308463 Uncaught exception
Change-Id: If0308eb0068951af425cb691672b915decc384a2
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 076f629..1d4fd75 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -82,14 +82,14 @@ SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi
* the corresponding API name.
*/
SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
- SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw();
+ SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(std::exception);
/**
* If the given name is a predefined API name it is replaced by the predefined name
* for the current language.
*/
SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
- SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw();
+ SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(std::exception);
#endif // INCLUDED_SVX_UNOAPI_HXX
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 3196ced..2acaf80 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1126,7 +1126,7 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI
return true;
}
-bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) throw()
+bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) throw(std::exception)
{
// first, calculate the search string length without an optional number behind the name
sal_Int32 nLength = rString.getLength();
@@ -1281,7 +1281,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] =
-bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw()
+bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw (std::exception)
{
//We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't
//replace "Red Hat 1" with the translation of Red :-)
@@ -1312,7 +1312,7 @@ bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uIn
/** if the given name is a predefined name for the current language it is replaced by
the corresponding api name.
*/
-OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw()
+OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(std::exception)
{
OUString aNew = rInternalName;
@@ -1345,7 +1345,7 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern
/** if the given name is a predefined api name it is replaced by the predefined name
for the current language.
*/
-OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw()
+OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(std::exception)
{
OUString aNew = rApiName;
commit 16f8348f366e27cc34d67cb8c075f0489bc9f63d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:24:44 2015 +0100
coverity#1308429 Unchecked return value
Change-Id: I1d7db630eb6d0c12c5eb8b507be114693689e4e1
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 46fc19a..d81850d 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -484,7 +484,7 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath)
OUString sNormedPath = sPath;
// "/bla" => "bla" && "/" => "" (!)
- sNormedPath.startsWith(PATH_SEPARATOR, &sNormedPath);
+ (void)sNormedPath.startsWith(PATH_SEPARATOR, &sNormedPath);
// "/" => "" || "" => "" ?
if (sNormedPath.isEmpty())
commit dc0b9ffb6d77d4944e99b4ee065b8d38bcb04d0e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:18:06 2015 +0100
coverity#1308595 Uncaught exception
Change-Id: I2245925215e98077c9665803435d39e9a05de367
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 6a9ae21..efee1d8 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -115,7 +115,7 @@ protected:
@param rxLayer
The new layer object.
*/
- void setActiveLayer (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>& rxLayer) throw (css::uno::RuntimeException);
+ void setActiveLayer (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>& rxLayer) throw (css::uno::RuntimeException, std::exception);
void SetZoom( sal_Int16 nZoom );
sal_Int16 GetZoom() const;
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 486c86f..c318bfb 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -127,7 +127,7 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() throw ()
}
void SdUnoDrawView::setActiveLayer (const Reference<drawing::XLayer>& rxLayer)
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// Get the SdrLayer object corresponding to the given reference.
if ( ! rxLayer.is())
commit 69dcc8f4e5f99cbc2f5405429c4ffc874fecc1b4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:15:55 2015 +0100
coverity#1308594 Uncaught exception
Change-Id: Ic320ba53565ef735d24a3538bf1863b3fb37c97a
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 2f6b668..21174c7 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -240,7 +240,7 @@ const lang::Locale& ScaPricingAddIn::GetLocale( sal_uInt32 nIndex )
return (nIndex < sizeof( pLang )) ? pDefLocales[ nIndex ] : aFuncLoc;
}
-ResMgr& ScaPricingAddIn::GetResMgr() throw( uno::RuntimeException )
+ResMgr& ScaPricingAddIn::GetResMgr() throw( uno::RuntimeException, std::exception )
{
if( !pResMgr )
{
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 92a9d20..0acf09a 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -319,7 +319,7 @@ private:
void InitDefLocales();
const css::lang::Locale& GetLocale( sal_uInt32 nIndex );
- ResMgr& GetResMgr() throw( css::uno::RuntimeException );
+ ResMgr& GetResMgr() throw( css::uno::RuntimeException, std::exception );
void InitData();
OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( css::uno::RuntimeException, std::exception );
commit 2a5da1f2d80cc6147c9dfd9658049a76f1d021a1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:14:52 2015 +0100
coverity#1308593 Uncaught exception
Change-Id: I3cf82f3f0e859b24d75f8ca8e0daf82b02becb0a
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 0f13ae0..aa09743 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2366,7 +2366,7 @@ namespace
}
}
-void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index e30d303..7fb36ff 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -115,7 +115,7 @@ namespace connectivity
bool AllocBuffer();
void throwInvalidDbaseFormat();
- void SAL_CALL renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ void SAL_CALL renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception);
void throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName);
protected:
commit 92ca6ebebdfc2e11f98b9fa67caaa194087e0a41
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:13:36 2015 +0100
coverity#1308592 Uncaught exception
Change-Id: I1a63116534430ebf8d203c21baf248a84a39b221
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 29e5433..8216047 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -745,7 +745,7 @@ awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException
return aKeyEvent;
}
-void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, const awt::KeyEvent& rKeyEvent, const OUString& rMacroName ) throw (uno::RuntimeException)
+void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, const awt::KeyEvent& rKeyEvent, const OUString& rMacroName ) throw (uno::RuntimeException, std::exception)
{
OUString MacroName( rMacroName );
if ( !MacroName.isEmpty() )
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 7fbe36d..5eef1fc 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -48,7 +48,7 @@ MSFILTER_DLLPUBLIC OUString resolveVBAMacro( SfxObjectShell* pShell, const OUStr
MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& rMacroName, bool bSearchGlobalTemplates = false );
MSFILTER_DLLPUBLIC bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const OUString& sKey ) throw (::com::sun::star::uno::RuntimeException);
-MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxDoc, const ::com::sun::star::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (::com::sun::star::uno::RuntimeException);
+MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxDoc, const ::com::sun::star::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (::com::sun::star::uno::RuntimeException, std::exception);
typedef ::cppu::WeakImplHelper3<
commit 194140bda70724be47d9d73ad4f1c2fc99c7ac31
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:11:50 2015 +0100
coverity#1308591 Uncaught exception
Change-Id: I0e1198a9b0b9e5d37ff5278f340fc640d8886eb0
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 5b483c3..761f078 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -365,7 +365,7 @@ uno::Reference< XAccessible > SAL_CALL
OUString SAL_CALL
ScAccessibleTableBase::createAccessibleDescription()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
return sDesc;
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index 7e923c1..3bfe62c 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -226,7 +226,7 @@ protected:
/// Return this object's description.
virtual OUString SAL_CALL
createAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the object's current name.
virtual OUString SAL_CALL
commit f4f3eb309ec98d27a5be7e9ffeef5d22ee50706f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:10:54 2015 +0100
coverity#1308590 Uncaught exception
Change-Id: Ic92709acff10386f22b633e9cd4c3ad6cd1fbc9b
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index e348cb8..2f2ab79 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -104,7 +104,7 @@ private:
OUString m_aGuessedTextLang; // the 'guessed' language for the selection, "" if none could be guessed
LanguageGuessingHelper m_aLangGuessHelper;
- void LangMenu( const css::awt::Point& aPos ) throw (css::uno::RuntimeException);
+ void LangMenu( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception);
};
LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::Reference< uno::XComponentContext >& xContext ) :
@@ -131,7 +131,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
void LangSelectionStatusbarController::LangMenu(
const css::awt::Point& aPos )
-throw (css::uno::RuntimeException)
+throw (css::uno::RuntimeException, std::exception)
{
if (!m_bShowMenu)
return;
commit 005eb60e08541c3937547da28e0581f65971a93a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:09:52 2015 +0100
coverity#1308589 Uncaught exception
Change-Id: I18cf4edd57abd297273f94a78a1a612c60e0f570
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index e787031..db2b087 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -897,7 +897,7 @@ uno::Any ScVbaEventsHelper::createHyperlink( const uno::Sequence< uno::Any >& rA
}
uno::Any ScVbaEventsHelper::createWindow( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const
- throw (lang::IllegalArgumentException, uno::RuntimeException)
+ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
uno::Sequence< uno::Any > aArgs( 3 );
aArgs[ 0 ] <<= getVBADocument( mxModel );
diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx
index 87dd60b..b9530b0 100644
--- a/sc/source/ui/vba/vbaeventshelper.hxx
+++ b/sc/source/ui/vba/vbaeventshelper.hxx
@@ -61,7 +61,7 @@ private:
/** Creates a VBA Hyperlink object (the argument must contain a UNO cell). */
css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
/** Creates a VBA Window object (the argument must contain a model controller). */
- css::uno::Any createWindow( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+ css::uno::Any createWindow( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
private:
::rtl::Reference< ScVbaEventListener > mxListener;
commit 52b2ccf1769ed59b9a33ac1d5086e61f7ae6a408
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:06:23 2015 +0100
coverity#1308588 Uncaught exception
Change-Id: I1979075cc4ad9e6b37235306c658fcceb96d7721
diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx
index b9038d0..3a43af3 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -69,6 +69,11 @@ SAL_IMPLEMENT_MAIN()
SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
return 1;
}
+ catch (const std::exception &e)
+ {
+ SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ return 1;
+ }
return 0;
}
commit 10a7c828beeb6658124dfa94a9374d0a9971f079
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:05:07 2015 +0100
coverity#1308587 Uncaught exception
Change-Id: I45e699ebf255e7d933a3b5d77717dcd7583d8383
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 91e3687..68e4f3a 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -229,7 +229,7 @@ void OStorageHelper::SetCommonStorageEncryptionData(
sal_Int32 OStorageHelper::GetXStorageFormat(
const uno::Reference< embed::XStorage >& xStorage )
- throw ( uno::Exception )
+ throw ( uno::Exception, std::exception )
{
uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW );
diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx
index ec551d7..afa2176 100644
--- a/include/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.hxx
@@ -137,7 +137,7 @@ public:
// the following method supports only storages of OOo formats
static sal_Int32 GetXStorageFormat(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
- throw ( ::com::sun::star::uno::Exception );
+ throw ( ::com::sun::star::uno::Exception, std::exception );
static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
GetStorageOfFormatFromURL(
commit 7e5e4ac54cd374753389498d8a46c0c9e102a2a1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 12:04:19 2015 +0100
coverity#1308586 Uncaught exception
Change-Id: I86097e94dd47153a919bb7721376c5b98b50354e
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 9a6477d..8e09b9b 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -378,7 +378,8 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
throw ( lang::IllegalArgumentException,
io::IOException,
uno::Exception,
- uno::RuntimeException )
+ uno::RuntimeException,
+ std::exception )
{
uno::Reference< uno::XInterface > xResult;
diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx
index bd0eaf24..cef1817 100644
--- a/embeddedobj/source/commonembedding/xfactory.hxx
+++ b/embeddedobj/source/commonembedding/xfactory.hxx
@@ -66,7 +66,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLinkFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
commit 9e92e3ae52ef8e65ac1e9d5ea46fe7028db90786
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:46:37 2015 +0100
coverity#1308584 Uncaught exception
Change-Id: I55178c48f57c26f7eec7efa052abd9edbf7adeb0
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 40cbd0d..2ae3795 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -235,7 +235,7 @@ const lang::Locale& ScaDateAddIn::GetLocale( sal_uInt32 nIndex )
return (nIndex < sizeof( pLang )) ? pDefLocales[ nIndex ] : aFuncLoc;
}
-ResMgr& ScaDateAddIn::GetResMgr() throw( uno::RuntimeException )
+ResMgr& ScaDateAddIn::GetResMgr() throw( uno::RuntimeException, std::exception )
{
if( !pResMgr )
{
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 7ca2b98..333ed40 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -304,7 +304,7 @@ private:
void InitDefLocales();
const ::com::sun::star::lang::Locale& GetLocale( sal_uInt32 nIndex );
- ResMgr& GetResMgr() throw( ::com::sun::star::uno::RuntimeException );
+ ResMgr& GetResMgr() throw( ::com::sun::star::uno::RuntimeException, std::exception );
void InitData();
OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
More information about the Libreoffice-commits
mailing list