[Libreoffice-commits] core.git: 23 commits - cui/source filter/source formula/source include/svtools include/vcl sc/inc sc/source svtools/source sw/source vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Feb 24 04:53:43 PST 2014
cui/source/options/optgdlg.cxx | 4
filter/source/msfilter/svdfppt.cxx | 2
formula/source/ui/dlg/formula.cxx | 3
include/svtools/menuoptions.hxx | 5
include/vcl/settings.hxx | 14 -
sc/inc/afmtuno.hxx | 6
sc/inc/appluno.hxx | 18 +-
sc/inc/cellsuno.hxx | 15 +
sc/source/filter/xml/xmlexprt.cxx | 24 +-
sc/source/ui/app/inputhdl.cxx | 4
sc/source/ui/dbgui/tpsort.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 4
sc/source/ui/unoobj/afmtuno.cxx | 7
sc/source/ui/unoobj/appluno.cxx | 34 ++--
sc/source/ui/unoobj/cellsuno.cxx | 11 -
svtools/source/config/menuoptions.cxx | 34 ++--
sw/source/core/unocore/unotbl.cxx | 3
sw/source/ui/uno/swdetect.cxx | 275 +++++++++++++++++-----------------
vcl/source/app/settings.cxx | 8
19 files changed, 253 insertions(+), 220 deletions(-)
New commits:
commit 6e0bdf04add338b7d5b29fc7b3fc9f08cfd5e96f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 11:57:23 2014 +0000
sal_Bool arg of SetUseImagesInMenus was abused to squeeze '2' through it
which means that icons suddenly reappeared in the menus when the gtk
theme had disabled them
ref e8f8f24c8415898c787bbfb629247ed62e73a2b9
Change-Id: Ia9aef5ca39bda2ddf6d7c4ebc2bddc01d470d09b
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 47f8373..dc1ebbe 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -752,7 +752,9 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
if(m_pMenuIconsLB->GetSelectEntryPos() != m_pMenuIconsLB->GetSavedValue())
{
- aMenuOpt.SetMenuIconsState( m_pMenuIconsLB->GetSelectEntryPos() == 0 ? 2 : m_pMenuIconsLB->GetSelectEntryPos() - 1);
+ aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectEntryPos() == 0 ?
+ TRISTATE_INDET :
+ static_cast<TriState>(m_pMenuIconsLB->GetSelectEntryPos() - 1));
bModified = sal_True;
bMenuOptModified = sal_True;
bAppearanceChanged = sal_True;
diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx
index 97c9502..1229187 100644
--- a/include/svtools/menuoptions.hxx
+++ b/include/svtools/menuoptions.hxx
@@ -21,6 +21,7 @@
#include <svtools/svtdllapi.h>
#include <sal/types.h>
+#include <tools/gen.hxx>
#include <osl/mutex.hxx>
#include <unotools/options.hxx>
@@ -87,8 +88,8 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options
*//*-*****************************************************************************************************/
sal_Bool IsEntryHidingEnabled() const;
- sal_Int16 GetMenuIconsState() const;
- void SetMenuIconsState( sal_Int16 bState );
+ TriState GetMenuIconsState() const;
+ void SetMenuIconsState(TriState eState);
private:
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 9651d4d..15123c0 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -338,7 +338,7 @@ private:
bool mbHighContrast;
bool mbUseSystemUIFonts;
sal_uInt16 mnAutoMnemonic;
- TriState mnUseImagesInMenus;
+ TriState meUseImagesInMenus;
bool mnUseFlatBorders;
bool mbPreferredUseImagesInMenus;
long mnMinThumbSize;
@@ -648,18 +648,18 @@ public:
{ CopyData(); mpData->mnUseFlatMenus = bUseFlatMenus; }
bool GetUseFlatMenus() const
{ return mpData->mnUseFlatMenus; }
- void SetUseImagesInMenus( bool bUseImagesInMenus )
- { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus ? TRISTATE_TRUE : TRISTATE_FALSE; }
+ void SetUseImagesInMenus( TriState eUseImagesInMenus )
+ { CopyData(); mpData->meUseImagesInMenus = eUseImagesInMenus; }
bool GetUseImagesInMenus() const;
- void SetPreferredUseImagesInMenus( bool bPreferredUseImagesInMenus )
+ void SetPreferredUseImagesInMenus( bool bPreferredUseImagesInMenus )
{ CopyData(); mpData->mbPreferredUseImagesInMenus = bPreferredUseImagesInMenus; }
- bool GetPreferredUseImagesInMenus() const
+ bool GetPreferredUseImagesInMenus() const
{ return mpData->mbPreferredUseImagesInMenus; }
- void SetSkipDisabledInMenus( bool bSkipDisabledInMenus )
+ void SetSkipDisabledInMenus( bool bSkipDisabledInMenus )
{ CopyData(); mpData->mbSkipDisabledInMenus = bSkipDisabledInMenus; }
bool GetSkipDisabledInMenus() const
{ return mpData->mbSkipDisabledInMenus; }
- void SetHideDisabledMenuItems( bool bHideDisabledMenuItems )
+ void SetHideDisabledMenuItems( bool bHideDisabledMenuItems )
{ CopyData(); mpData->mbHideDisabledMenuItems = bHideDisabledMenuItems; }
bool GetHideDisabledMenuItems() const
{ return mpData->mbHideDisabledMenuItems; }
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 05c482b..4c37065 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno ;
#define ROOTNODE_MENU OUString("Office.Common/View/Menu" )
#define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False
#define DEFAULT_FOLLOWMOUSE sal_True
-#define DEFAULT_MENUICONS 2
+#define DEFAULT_MENUICONS TRISTATE_INDET
#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString("DontHideDisabledEntry" )
#define PROPERTYNAME_FOLLOWMOUSE OUString("FollowMouse" )
@@ -73,7 +73,7 @@ class SvtMenuOptions_Impl : public ConfigItem
::std::list<Link> aList;
sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section
sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section
- sal_Int16 m_nMenuIcons ; /// cache "MenuIcons" of Menu section
+ TriState m_eMenuIcons ; /// cache "MenuIcons" of Menu section
// public methods
@@ -149,8 +149,8 @@ class SvtMenuOptions_Impl : public ConfigItem
sal_Bool IsFollowMouseEnabled() const
{ return m_bFollowMouse; }
- sal_Int16 GetMenuIconsState() const
- { return m_nMenuIcons; }
+ TriState GetMenuIconsState() const
+ { return m_eMenuIcons; }
void SetEntryHidingState ( sal_Bool bState )
{
@@ -170,9 +170,9 @@ class SvtMenuOptions_Impl : public ConfigItem
Commit();
}
- void SetMenuIconsState ( sal_Int16 nState )
+ void SetMenuIconsState(TriState eState)
{
- m_nMenuIcons = nState;
+ m_eMenuIcons = eState;
SetModified();
for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
iter->Call( this );
@@ -210,7 +210,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
// Init member then.
, m_bDontHideDisabledEntries ( DEFAULT_DONTHIDEDISABLEDENTRIES )
, m_bFollowMouse ( DEFAULT_FOLLOWMOUSE )
- , m_nMenuIcons ( DEFAULT_MENUICONS )
+ , m_eMenuIcons ( DEFAULT_MENUICONS )
{
// Use our static list of configuration keys to get his values.
Sequence< OUString > seqNames = impl_GetPropertyNames();
@@ -223,12 +223,12 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
sal_Bool bMenuIcons = sal_True;
sal_Bool bSystemMenuIcons = sal_True;
- if (m_nMenuIcons == 2)
+ if (m_eMenuIcons == TRISTATE_INDET)
bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetPreferredUseImagesInMenus());
else
{
bSystemMenuIcons = sal_False;
- bMenuIcons = m_nMenuIcons ? sal_True : sal_False;
+ bMenuIcons = m_eMenuIcons ? sal_True : sal_False;
}
// Copy values from list in right order to our internal member.
@@ -269,7 +269,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
}
}
- m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
+ m_eMenuIcons = bSystemMenuIcons ? TRISTATE_INDET : static_cast<TriState>(bMenuIcons);
EnableNotification( seqNames );
}
@@ -301,12 +301,12 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
bool bMenuSettingsChanged = false;
sal_Bool bMenuIcons = sal_True;
sal_Bool bSystemMenuIcons = sal_True;
- if (m_nMenuIcons == 2)
+ if (m_eMenuIcons == TRISTATE_INDET)
bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
else
{
bSystemMenuIcons = sal_False;
- bMenuIcons = m_nMenuIcons ? sal_True : sal_False;
+ bMenuIcons = m_eMenuIcons ? sal_True : sal_False;
}
// Step over list of property names and get right value from coreesponding value list to set it on internal members!
@@ -340,7 +340,7 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
}
if ( bMenuSettingsChanged )
- m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
+ m_eMenuIcons = bSystemMenuIcons ? TRISTATE_INDET : static_cast<TriState>(bMenuIcons);
for ( ::std::list<Link>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
iter->Call( this );
@@ -375,7 +375,7 @@ void SvtMenuOptions_Impl::Commit()
}
break;
case PROPERTYHANDLE_SYSTEMICONSINMENUES : {
- sal_Bool bValue = (m_nMenuIcons == 2 ? sal_True : sal_False) ;
+ sal_Bool bValue = (m_eMenuIcons == TRISTATE_INDET ? sal_True : sal_False) ;
seqValues[nProperty] <<= bValue;
}
break;
@@ -477,7 +477,7 @@ sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-sal_Int16 SvtMenuOptions::GetMenuIconsState() const
+TriState SvtMenuOptions::GetMenuIconsState() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->GetMenuIconsState();
@@ -486,10 +486,10 @@ sal_Int16 SvtMenuOptions::GetMenuIconsState() const
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState )
+void SvtMenuOptions::SetMenuIconsState(TriState eState)
{
MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetMenuIconsState( bState );
+ m_pDataContainer->SetMenuIconsState(eState);
}
//*****************************************************************************************************************
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index dd2fe1a..727b5d6 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -207,7 +207,7 @@ ImplStyleData::ImplStyleData() :
mnOptions = 0;
mnAutoMnemonic = 1;
mnToolbarIconSize = STYLE_TOOLBAR_ICONSIZE_UNKNOWN;
- mnUseImagesInMenus = TRISTATE_INDET;
+ meUseImagesInMenus = TRISTATE_INDET;
mpFontOptions = NULL;
mnEdgeBlending = 35;
maEdgeBlendingTopLeftColor = RGB_COLORDATA(0xC0, 0xC0, 0xC0);
@@ -323,7 +323,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
mnUseFlatBorders = rData.mnUseFlatBorders;
mnUseFlatMenus = rData.mnUseFlatMenus;
mnAutoMnemonic = rData.mnAutoMnemonic;
- mnUseImagesInMenus = rData.mnUseImagesInMenus;
+ meUseImagesInMenus = rData.meUseImagesInMenus;
mbPreferredUseImagesInMenus = rData.mbPreferredUseImagesInMenus;
mbSkipDisabledInMenus = rData.mbSkipDisabledInMenus;
mbHideDisabledMenuItems = rData.mbHideDisabledMenuItems;
@@ -519,7 +519,7 @@ void StyleSettings::SetCheckedColorSpecialCase( )
bool StyleSettings::GetUseImagesInMenus() const
{
// icon mode selected in Tools -> Options... -> OpenOffice.org -> View
- switch (mpData->mnUseImagesInMenus) {
+ switch (mpData->meUseImagesInMenus) {
case TRISTATE_FALSE:
return false;
case TRISTATE_TRUE:
@@ -774,7 +774,7 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
(mpData->maPushButtonFont == rSet.mpData->maPushButtonFont) &&
(mpData->maFieldFont == rSet.mpData->maFieldFont) &&
(mpData->maIconFont == rSet.mpData->maIconFont) &&
- (mpData->mnUseImagesInMenus == rSet.mpData->mnUseImagesInMenus) &&
+ (mpData->meUseImagesInMenus == rSet.mpData->meUseImagesInMenus) &&
(mpData->mbPreferredUseImagesInMenus == rSet.mpData->mbPreferredUseImagesInMenus) &&
(mpData->mbSkipDisabledInMenus == rSet.mpData->mbSkipDisabledInMenus) &&
(mpData->mbHideDisabledMenuItems == rSet.mpData->mbHideDisabledMenuItems) &&
commit a8fad94ef2f3a1e30518d1f8c1f7712b5fa67ae6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:52:07 2014 +0000
coverity#737422 Uncaught exception
Change-Id: Ieca32131ad7b1019338af8042ab6905e3ba152d6
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 49d710d..e75d7f7 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1196,7 +1196,8 @@ public:
// XSheetOutline
virtual void SAL_CALL group( const ::com::sun::star::table::CellRangeAddress& aRange,
::com::sun::star::table::TableOrientation nOrientation )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL ungroup( const ::com::sun::star::table::CellRangeAddress& aRange,
::com::sun::star::table::TableOrientation nOrientation )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index c55e73f..a095dbb 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7857,7 +7857,8 @@ void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException)
void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange,
table::TableOrientation nOrientation )
- throw(uno::RuntimeException)
+ throw (uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
commit 4e2db965f9d0e07082b302f3e2d771c0009aaa25
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:50:44 2014 +0000
coverity#737388 Uncaught exception
Change-Id: I55fd2311d6439a6f8616f9c21fa1e7222efde794
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 5368f08..49d710d 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -552,10 +552,11 @@ public:
// XNameContainer
virtual void SAL_CALL insertByName( const OUString& aName,
const ::com::sun::star::uno::Any& aElement )
- throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::ElementExistException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::container::ElementExistException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeByName( const OUString& Name )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index b3181fb..c55e73f 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -4420,8 +4420,9 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const OUS
}
void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::Any& aElement )
- throw(lang::IllegalArgumentException, container::ElementExistException,
- lang::WrappedTargetException, uno::RuntimeException)
+ throw (lang::IllegalArgumentException, container::ElementExistException,
+ lang::WrappedTargetException, uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
commit b10fee9d8d3b61579841ee584cc6fcca5869f5e9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:48:21 2014 +0000
coverity#737363 Uncaught exception
Change-Id: I29717d8379a69eede5ef44b57934c2fe70c04248
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a5b596b..5368f08 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -694,7 +694,8 @@ public:
// XArrayFormulaTokens
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getArrayTokens()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setArrayTokens( const ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::FormulaToken >& aTokens )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index ebbd444..b3181fb 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5146,7 +5146,8 @@ void ScCellRangeObj::SetArrayFormulaWithGrammar( const OUString& rFormula,
// XArrayFormulaTokens
-uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() throw(uno::RuntimeException)
+uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit e2abad8add51b5cf23f415c7d72097124f29e2cf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:46:49 2014 +0000
coverity#737355 Uncaught exception
Change-Id: Ib6b54de2a02fedd42fa28155762b4d3c25957607
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 6609551..e7acf56 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -156,11 +156,12 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual 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);
+ 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 ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 19a9703..3f8a765 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -453,9 +453,9 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPrope
void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
const OUString& aPropertyName, const uno::Any& aValue )
- 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;
OUString aString(aPropertyName);
commit 687f46d608ba2f5c0d9c55c5e013e2afd74f8d3a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:45:27 2014 +0000
coverity#737354 Uncaught exception
Change-Id: Iedbff972ef4fba9b0fa877db76a1e9b099223279
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index b63fdab..6609551 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -163,9 +163,10 @@ public:
::com::sun::star::uno::RuntimeException);
virtual ::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);
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 0b2e0f7..19a9703 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -600,8 +600,8 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
}
uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aPropertyName )
- throw(beans::UnknownPropertyException, lang::WrappedTargetException,
- uno::RuntimeException)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
+ uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aString = aPropertyName;
commit 4e95a50d8b9a404caa63b0d329d0e43b63a20668
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:43:45 2014 +0000
coverity#737343 Uncaught exception
Change-Id: I5097c5c98580619d066ea928f1970cc6e7160783
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index d181028..d7e993a 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -75,7 +75,8 @@ public:
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeByName( const OUString& Name )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index cbfbfb7..066a2c4 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -229,8 +229,9 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const OUString& aName)
// container::XNameContainer
void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::Any& aElement )
- throw(lang::IllegalArgumentException, container::ElementExistException,
- lang::WrappedTargetException, uno::RuntimeException)
+ throw (lang::IllegalArgumentException, container::ElementExistException,
+ lang::WrappedTargetException, uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bDone = false;
commit 7d2d7b5e5947c570ecc33a8ac0a0b9448e0689ea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:42:56 2014 +0000
coverity#737340 Uncaught exception
Change-Id: I1549368658a5918fb16b58b614c2c789be94060e
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index d6a35e5..d181028 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -169,7 +169,8 @@ public:
// XNamed
virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 2e0a87b..cbfbfb7 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -530,7 +530,7 @@ OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException)
}
void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName )
- throw(uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aNewString(aNewName);
commit 2e9d267c2ba944d8465849af608f2ee097f5810e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:41:35 2014 +0000
coverity#737278 Uncaught exception
Change-Id: I8b9c02d5e87433cb48a7cee37b696d36e453dd52
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 8578f7f..1ba9977 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -421,7 +421,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedService
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception)
{
return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_Settings_getImplementationName(), EXPORT_SETTINGS|EXPORT_OASIS);
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 3f4ff85..0b2e0f7 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -123,7 +123,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_creat
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception);
commit 484af8f1d27cab8aff234e10d8db5ee5ce050427
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:39:55 2014 +0000
coverity#737277 Uncaught exception
Change-Id: I4bb6964fb585a027ade3540456bf71bdf70d7662
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 81dd2b9..8578f7f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -402,7 +402,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceN
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception)
{
return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_Content_getImplementationName(), EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS|EXPORT_OASIS);
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index ea5b4e6..3f4ff85 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -118,7 +118,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_create
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception);
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance(
commit 9ee8026d8bf723b798c0e1e6c3a52afb74eb0b67
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:38:43 2014 +0000
coverity#737274 Uncaught exception
Change-Id: I33a22974a9485e4556ed44f990d6d13a8901c511
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 3690586..81dd2b9 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -306,7 +306,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNam
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception)
{
return (cppu::OWeakObject*)new ScXMLExport( comphelper::getComponentContext(rSMgr), ScXMLOOoExport_Content_getImplementationName(), EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS);
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 7a3cca3..ea5b4e6 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -91,7 +91,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createIn
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception);
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance(
commit 3907ef9e47f6208b402f570d38b53881d1391a12
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:37:56 2014 +0000
coverity#737273 Uncaught exception
Change-Id: Ib1e7ee8903c9b3e276c9244a6e4b67499f22c661
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index d29609a..3690586 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -363,7 +363,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceName
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception)
{
return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_Meta_getImplementationName(), EXPORT_META|EXPORT_OASIS);
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index c966dff..7a3cca3 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -107,7 +107,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstanc
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception);
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstance(
commit 50ffcf3bd5b45aec6d4b83c614019492bb5911fd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:37:06 2014 +0000
coverity#737272 Uncaught exception
Change-Id: Ibab84222db96181b175f58625105af1237e48136
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index d70d385..d29609a 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -288,7 +288,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceName
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception)
{
return (cppu::OWeakObject*)new ScXMLExport( comphelper::getComponentContext(rSMgr), ScXMLOOoExport_Styles_getImplementationName(), EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS);
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 9b96efe..c966dff 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -86,7 +86,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInst
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception);
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance(
commit 5eb94774453da39678247c5f761b0fc588ef5a50
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:35:48 2014 +0000
coverity#737271 Uncaught exception
Change-Id: I3275220925cc81ce5dbf507793e0d74cb88e2ab4
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 443a924..d70d385 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -270,7 +270,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames(
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception)
{
return (cppu::OWeakObject*)new ScXMLExport( comphelper::getComponentContext(rSMgr), ScXMLOOoExport_Meta_getImplementationName(), EXPORT_META );
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 4eba07c..9b96efe 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -81,7 +81,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance(
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception);
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance(
commit f78dbca68210ebd2aa09a6af5a600c3e24cd3a37
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:34:58 2014 +0000
coverity#737270 Uncaught exception
Change-Id: I7f129c868034df3d56060cc870c335b36a1a6d4a
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index e333095f..443a924 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -342,7 +342,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() t
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception)
{
return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_getImplementationName(), EXPORT_ALL|EXPORT_OASIS);
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 3394ea3..4eba07c 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -100,7 +100,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_create
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception);
extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance(
commit 3d5f2d13dfb4d0d14f8576f7f1797c3fd5029340
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 12:02:47 2014 +0000
coverity#737269 Uncaught exception
Change-Id: Ib6240c818c6f17df63693aa4fc4a4ca207df27b6
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index cef13ac..e333095f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -252,7 +252,8 @@ uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() thr
}
uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw(uno::Exception, std::exception)
{
return (cppu::OWeakObject*)new ScXMLExport( comphelper::getComponentContext(rSMgr), ScXMLOOoExport_getImplementationName(), EXPORT_ALL );
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 827e64b..3394ea3 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -76,7 +76,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createIns
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
+ const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (uno::Exception, std::exception);
extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw();
extern OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw();
extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance(
commit 9cbc3a2aa70c77657670fccef03b1b74ef3f4704
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 10:49:31 2014 +0000
coverity#707304 Uncaught exception
Change-Id: I4384b87566d595ce47dd934e35c8bb9267d6cb1b
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 20a873d..c0ecdb5 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -147,7 +147,8 @@ static bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSv
static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
const SfxItemPropertySimpleEntry* pEntry,
const uno::Any& aValue)
- throw (lang::IllegalArgumentException)
+ throw (lang::IllegalArgumentException,
+ uno::RuntimeException)
{
// special treatment for "non-items"
switch(pEntry->nWID)
commit e72f739393643a566bc61b9c45474fbab99c4daf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 10:01:55 2014 +0000
coverity#707318 Uncaught exception
Change-Id: I65bfcbe4ab6fceed3ae474dcb3225df197ddaa2b
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index ef54f79..35bcd8f 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -175,173 +175,176 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
}
else
{
- // ctor of SfxMedium uses owner transition of ItemSet
- SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, NULL, pSet );
- aMedium.UseInteractionHandler( sal_True );
- if ( aMedium.GetErrorCode() == ERRCODE_NONE )
+ try
{
- // remember input stream and content and put them into the descriptor later
- // should be done here since later the medium can switch to a version
- xStream = aMedium.GetInputStream();
- xContent = aMedium.GetContent();
- bReadOnly = aMedium.IsReadOnly();
-
- sal_Bool bIsStorage = aMedium.IsStorage();
- if ( bIsStorage )
+ // ctor of SfxMedium uses owner transition of ItemSet
+ SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, NULL, pSet );
+ aMedium.UseInteractionHandler( sal_True );
+ if ( aMedium.GetErrorCode() == ERRCODE_NONE )
{
- Reference< embed::XStorage > xStorage = aMedium.GetStorage( sal_False );
- if ( aMedium.GetLastStorageCreationState() != ERRCODE_NONE )
+ // remember input stream and content and put them into the descriptor later
+ // should be done here since later the medium can switch to a version
+ xStream = aMedium.GetInputStream();
+ xContent = aMedium.GetContent();
+ bReadOnly = aMedium.IsReadOnly();
+
+ sal_Bool bIsStorage = aMedium.IsStorage();
+ if ( bIsStorage )
{
- // error during storage creation means _here_ that the medium
- // is broken, but we can not handle it in medium since impossibility
- // to create a storage does not _always_ means that the medium is broken
- aMedium.SetError( aMedium.GetLastStorageCreationState(), OUString( OSL_LOG_PREFIX ) );
- if ( xInteraction.is() )
+ Reference< embed::XStorage > xStorage = aMedium.GetStorage( sal_False );
+ if ( aMedium.GetLastStorageCreationState() != ERRCODE_NONE )
{
- OUString empty;
- try
- {
- InteractiveAppException xException( empty,
- Reference< XInterface >(),
- InteractionClassification_ERROR,
- aMedium.GetError() );
-
- Reference< XInteractionRequest > xRequest(
- new ucbhelper::SimpleInteractionRequest( makeAny( xException ),
- ucbhelper::CONTINUATION_APPROVE ) );
- xInteraction->handle( xRequest );
- }
- catch (const Exception&)
+ // error during storage creation means _here_ that the medium
+ // is broken, but we can not handle it in medium since impossibility
+ // to create a storage does not _always_ means that the medium is broken
+ aMedium.SetError( aMedium.GetLastStorageCreationState(), OUString( OSL_LOG_PREFIX ) );
+ if ( xInteraction.is() )
{
+ OUString empty;
+ try
+ {
+ InteractiveAppException xException( empty,
+ Reference< XInterface >(),
+ InteractionClassification_ERROR,
+ aMedium.GetError() );
+
+ Reference< XInteractionRequest > xRequest(
+ new ucbhelper::SimpleInteractionRequest( makeAny( xException ),
+ ucbhelper::CONTINUATION_APPROVE ) );
+ xInteraction->handle( xRequest );
+ }
+ catch (const Exception&)
+ {
+ }
}
}
- }
- else
- {
- OSL_ENSURE( xStorage.is(), "At this point storage must exist!" );
-
- try
+ else
{
- const SfxFilter* pPreFilter = !aPreselectedFilterName.isEmpty() ?
- SfxFilterMatcher().GetFilter4FilterName( aPreselectedFilterName ) : !aTypeName.isEmpty() ?
- SfxFilterMatcher(OUString("swriter")).GetFilter4EA( aTypeName ) : 0;
- if (!pPreFilter)
- pPreFilter = SfxFilterMatcher(OUString("sweb")).GetFilter4EA( aTypeName );
- OUString aFilterName;
- if ( pPreFilter )
+ OSL_ENSURE( xStorage.is(), "At this point storage must exist!" );
+
+ try
{
- aFilterName = pPreFilter->GetName();
- aTypeName = pPreFilter->GetTypeName();
- }
+ const SfxFilter* pPreFilter = !aPreselectedFilterName.isEmpty() ?
+ SfxFilterMatcher().GetFilter4FilterName( aPreselectedFilterName ) : !aTypeName.isEmpty() ?
+ SfxFilterMatcher(OUString("swriter")).GetFilter4EA( aTypeName ) : 0;
+ if (!pPreFilter)
+ pPreFilter = SfxFilterMatcher(OUString("sweb")).GetFilter4EA( aTypeName );
+ OUString aFilterName;
+ if ( pPreFilter )
+ {
+ aFilterName = pPreFilter->GetName();
+ aTypeName = pPreFilter->GetTypeName();
+ }
- aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pPreFilter ? pPreFilter->IsOwnTemplateFormat() : sal_False, &aFilterName );
- }
- catch (const WrappedTargetException& aWrap)
- {
- if (!bDeepDetection)
- // Bail out early unless it's a deep detection.
- return OUString();
+ aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pPreFilter ? pPreFilter->IsOwnTemplateFormat() : sal_False, &aFilterName );
+ }
+ catch (const WrappedTargetException& aWrap)
+ {
+ if (!bDeepDetection)
+ // Bail out early unless it's a deep detection.
+ return OUString();
- packages::zip::ZipIOException aZipException;
+ packages::zip::ZipIOException aZipException;
- // repairing is done only if this type is requested from outside
- // we don't do any type detection on broken packages (f.e. because it might be impossible), so any requested
- // type will be accepted if the user allows to repair the file
- if ( ( aWrap.TargetException >>= aZipException ) && ( !aTypeName.isEmpty() || !aPreselectedFilterName.isEmpty() ) )
- {
- if ( xInteraction.is() )
+ // repairing is done only if this type is requested from outside
+ // we don't do any type detection on broken packages (f.e. because it might be impossible), so any requested
+ // type will be accepted if the user allows to repair the file
+ if ( ( aWrap.TargetException >>= aZipException ) && ( !aTypeName.isEmpty() || !aPreselectedFilterName.isEmpty() ) )
{
- // the package is a broken one
- aDocumentTitle = aMedium.GetURLObject().getName(
- INetURLObject::LAST_SEGMENT,
- true,
- INetURLObject::DECODE_WITH_CHARSET );
-
- if ( !bRepairPackage )
+ if ( xInteraction.is() )
{
- // ask the user whether he wants to try to repair
- RequestPackageReparation aRequest( aDocumentTitle );
- xInteraction->handle( aRequest.GetRequest() );
- bRepairAllowed = aRequest.isApproved();
+ // the package is a broken one
+ aDocumentTitle = aMedium.GetURLObject().getName(
+ INetURLObject::LAST_SEGMENT,
+ true,
+ INetURLObject::DECODE_WITH_CHARSET );
+
+ if ( !bRepairPackage )
+ {
+ // ask the user whether he wants to try to repair
+ RequestPackageReparation aRequest( aDocumentTitle );
+ xInteraction->handle( aRequest.GetRequest() );
+ bRepairAllowed = aRequest.isApproved();
+ }
+
+ if ( !bRepairAllowed )
+ {
+ // repair either not allowed or not successful
+ // repair either not allowed or not successful
+ NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+ xInteraction->handle( aNotifyRequest.GetRequest() );
+
+ Reference< ::comphelper::OIHWrapNoFilterDialog > xHandler = new ::comphelper::OIHWrapNoFilterDialog( xInteraction );
+ if ( nIndexOfInteractionHandler != -1 )
+ lDescriptor[nIndexOfInteractionHandler].Value <<= Reference< XInteractionHandler >( static_cast< XInteractionHandler* >( xHandler.get() ) );
+
+ aMedium.SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) );
+ }
}
+ else
+ // no interaction, error handling as usual
+ aMedium.SetError( ERRCODE_IO_BROKENPACKAGE, OUString( OSL_LOG_PREFIX ) );
if ( !bRepairAllowed )
{
- // repair either not allowed or not successful
- // repair either not allowed or not successful
- NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
- xInteraction->handle( aNotifyRequest.GetRequest() );
-
- Reference< ::comphelper::OIHWrapNoFilterDialog > xHandler = new ::comphelper::OIHWrapNoFilterDialog( xInteraction );
- if ( nIndexOfInteractionHandler != -1 )
- lDescriptor[nIndexOfInteractionHandler].Value <<= Reference< XInteractionHandler >( static_cast< XInteractionHandler* >( xHandler.get() ) );
-
- aMedium.SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) );
+ aTypeName = "";
+ aPreselectedFilterName = "";
}
}
- else
- // no interaction, error handling as usual
- aMedium.SetError( ERRCODE_IO_BROKENPACKAGE, OUString( OSL_LOG_PREFIX ) );
-
- if ( !bRepairAllowed )
- {
- aTypeName = "";
- aPreselectedFilterName = "";
- }
}
}
- catch (const RuntimeException&)
- {
- throw;
- }
- catch (const Exception&)
- {
- aTypeName = "";
- aPreselectedFilterName = "";
- }
}
- }
- else
- {
- aMedium.GetInStream();
- if ( aMedium.GetErrorCode() == ERRCODE_NONE )
+ else
{
- if ( !aPreselectedFilterName.isEmpty() )
- pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName );
- else
- pFilter = SfxFilterMatcher().GetFilter4EA( aTypeName );
+ aMedium.GetInStream();
+ if ( aMedium.GetErrorCode() == ERRCODE_NONE )
+ {
+ if ( !aPreselectedFilterName.isEmpty() )
+ pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName );
+ else
+ pFilter = SfxFilterMatcher().GetFilter4EA( aTypeName );
- bool bTestWriter = !pFilter || pFilter->GetServiceName() == "com.sun.star.text.TextDocument" ||
- pFilter->GetServiceName() == "com.sun.star.text.WebDocument";
- bool bTestGlobal = !pFilter || pFilter->GetServiceName() == "com.sun.star.text.GlobalDocument";
+ bool bTestWriter = !pFilter || pFilter->GetServiceName() == "com.sun.star.text.TextDocument" ||
+ pFilter->GetServiceName() == "com.sun.star.text.WebDocument";
+ bool bTestGlobal = !pFilter || pFilter->GetServiceName() == "com.sun.star.text.GlobalDocument";
- const SfxFilter* pOrigFilter = NULL;
- if ( !bTestWriter && !bTestGlobal && pFilter )
- {
- // cross filter; now this should be a type detection only, not a filter detection
- // we can simulate it by preserving the preselected filter if the type matches
- // example: HTML filter for Calc
- pOrigFilter = pFilter;
- pFilter = SfxFilterMatcher().GetFilter4EA( pFilter->GetTypeName() );
- bTestWriter = true;
+ const SfxFilter* pOrigFilter = NULL;
+ if ( !bTestWriter && !bTestGlobal && pFilter )
+ {
+ // cross filter; now this should be a type detection only, not a filter detection
+ // we can simulate it by preserving the preselected filter if the type matches
+ // example: HTML filter for Calc
+ pOrigFilter = pFilter;
+ pFilter = SfxFilterMatcher().GetFilter4EA( pFilter->GetTypeName() );
+ bTestWriter = true;
+ }
+
+ sal_uLong nErr = ERRCODE_NONE;
+ if ( pFilter || bTestWriter )
+ nErr = DetectFilter( aMedium, &pFilter );
+ if ( nErr != ERRCODE_NONE )
+ pFilter = NULL;
+ else if ( pOrigFilter && pFilter && pFilter->GetTypeName() == pOrigFilter->GetTypeName() )
+ // cross filter, see above
+ pFilter = pOrigFilter;
}
- sal_uLong nErr = ERRCODE_NONE;
- if ( pFilter || bTestWriter )
- nErr = DetectFilter( aMedium, &pFilter );
- if ( nErr != ERRCODE_NONE )
- pFilter = NULL;
- else if ( pOrigFilter && pFilter && pFilter->GetTypeName() == pOrigFilter->GetTypeName() )
- // cross filter, see above
- pFilter = pOrigFilter;
+ if ( pFilter )
+ aTypeName = pFilter->GetTypeName();
+ else
+ aTypeName = "";
}
-
- if ( pFilter )
- aTypeName = pFilter->GetTypeName();
- else
- aTypeName = "";
}
}
+ catch (const RuntimeException&)
+ {
+ throw;
+ }
+ catch (const Exception&)
+ {
+ aTypeName = "";
+ aPreselectedFilterName = "";
+ }
}
if ( nIndexOfInputStream == -1 && xStream.is() )
commit 662283db76783be9cf44a16aa2b1d7b475088c83
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 09:46:00 2014 +0000
coverity#735810 Dereference after null check
Change-Id: I005ae6bf505fd2131c06e889f9fc3c12dae23c64
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 275f3af..c1ef3e4 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2062,8 +2062,8 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
}
OSL_ENSURE( pStyleSet, "PageStyle-Set not found! :-(" );
-
-
+ if (!pStyleSet)
+ return;
const SvxSetItem* pSetItem = NULL;
const SfxItemSet* pSet = NULL;
commit e40a7f2e59f87467f552094564cbbe34ff936f4b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 09:44:17 2014 +0000
coverity#735808 Dereference after null check
Change-Id: Idd8ff57f5c970d15e199831bb1b1251ced32eeec
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 61b54eb..4a85446 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -273,7 +273,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
// If the "OK" was selected on the Options page while the sort
// direction was changed, then the first field (i.e. nFieldArr[0])
// of the respective direction is chosen as the sorting criterion:
- if ( bSortByRows != pDlg->GetByRows() )
+ if ( pDlg && bSortByRows != pDlg->GetByRows() )
{
for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
aNewSortData.maKeyState[i].nField = ( bSortByRows ?
commit b854cb787ec56ddaf62fc9a6883c0ead6f0208a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 09:37:34 2014 +0000
coverity#735747 Dereference after null check
also
coverity#736774 Dereference before null check
Change-Id: Ic2e2a341565af0609ec748b40ac7848a46c9e3af
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 392e30e..6fb5d42 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1857,7 +1857,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
if ( !pRet && ( pOe->nType == PPT_PST_ExControl ) )
{
uno::Reference< io::XInputStream > xIStrm = new utl::OSeekableInputStreamWrapper(*pDest );
- uno::Reference< frame::XModel > xModel( pOe->pShell ? pOe->pShell->GetModel() : NULL );
+ uno::Reference< frame::XModel > xModel( pOe->pShell->GetModel() );
PPTConvertOCXControls aPPTConvertOCXControls( this, xIStrm, xModel, eAktPageKind );
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape, sal_False ) )
commit 819cc6431878302717442b141415c08d8bf4493a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 09:32:20 2014 +0000
coverity#735751 Dereference after null check
Change-Id: Id7e11fefec40d11c509bde01533122ca68db7402
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 085242f..86100c4 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -291,8 +291,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
pMEdit = aMEFormula.GetEdit();
aMEFormula.SetAccessibleName(aFtFormula.GetText());
- if (pMEdit)
- pMEdit->SetAccessibleName(aFtFormula.GetText());
+ pMEdit->SetAccessibleName(aFtFormula.GetText());
m_aEditHelpId = pMEdit->GetHelpId();
pMEdit->SetUniqueId( m_aEditHelpId );
commit 21cea08139adf20fe86f5bc5724e9e22d7a627b4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 09:27:44 2014 +0000
coverity#735801 Dereference after null check
Change-Id: I4a403098388bdb7f4f09242fcd71a50d38fc630e
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 026a5ba..b629b51 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2992,8 +2992,8 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc )
}
else
{
- if ( ( rRef.aStart.Tab() != aCursorPos.Tab() ||
- rRef.aStart.Tab() != rRef.aEnd.Tab() ) && pDoc )
+ if ( rRef.aStart.Tab() != aCursorPos.Tab() ||
+ rRef.aStart.Tab() != rRef.aEnd.Tab() )
aRefStr = rRef.Format(SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails);
else
aRefStr = rRef.Format(SCA_VALID, pDoc, aAddrDetails);
More information about the Libreoffice-commits
mailing list