diff options
Diffstat (limited to 'unotools/source/config')
-rw-r--r-- | unotools/source/config/configitem.cxx | 45 | ||||
-rw-r--r-- | unotools/source/config/historyoptions.cxx | 18 | ||||
-rw-r--r-- | unotools/source/config/itemholder1.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/pathoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/useroptions.cxx | 6 |
5 files changed, 32 insertions, 41 deletions
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index d0d17510ebe4..80d18841299e 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -423,7 +423,7 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames) "unotools.config", "ignoring XHierarchicalNameAccess to /org.openoffice." << sSubTree << "/" << pNames[i] << " Exception: " - << rEx.Message); + << rEx); } } @@ -503,7 +503,7 @@ bool ConfigItem::PutProperties( const Sequence< OUString >& rNames, { SAL_WARN( "unotools.config", - "Exception from PutProperties: " << e.Message); + "Exception from PutProperties: " << e); } } try @@ -515,7 +515,7 @@ bool ConfigItem::PutProperties( const Sequence< OUString >& rNames, { SAL_WARN( "unotools.config", - "Exception from commitChanges(): " << e.Message); + "Exception from commitChanges(): " << e); } } @@ -645,7 +645,7 @@ Sequence< OUString > ConfigItem::GetNodeNames(const OUString& rNode, ConfigNameF { SAL_WARN( "unotools.config", - "Exception from GetNodeNames: " << e.Message); + "Exception from GetNodeNames: " << e); } } return aRet; @@ -683,7 +683,7 @@ bool ConfigItem::ClearNodeSet(const OUString& rNode) { SAL_WARN( "unotools.config", - "Exception from removeByName(): " << e.Message); + "Exception from removeByName(): " << e); } } xBatch->commitChanges(); @@ -691,8 +691,7 @@ bool ConfigItem::ClearNodeSet(const OUString& rNode) } catch (css::uno::Exception & e) { - SAL_WARN( - "unotools.config", "Exception from ClearNodeSet" << e.Message); + SAL_WARN("unotools.config", "Exception from ClearNodeSet" << e); } } return bRet; @@ -731,7 +730,7 @@ bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString > c { SAL_WARN( "unotools.config", - "Exception from commitChanges(): " << e.Message); + "Exception from commitChanges(): " << e); } bRet = true; } @@ -739,7 +738,7 @@ bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString > c { SAL_WARN( "unotools.config", - "Exception from GetNodeNames: " << e.Message); + "Exception from GetNodeNames: " << e); } } return bRet; @@ -829,7 +828,7 @@ bool ConfigItem::SetSetProperties( { SAL_WARN( "unotools.config", - "Exception from commitChanges(): " << e.Message); + "Exception from commitChanges(): " << e); } const PropertyValue* pProperties = rValues.getConstArray(); @@ -870,8 +869,7 @@ bool ConfigItem::SetSetProperties( { SAL_WARN( "unotools.config", - "Exception form insert/replaceByName(): " - << e.Message); + "Exception form insert/replaceByName(): " << e); } } xBatch->commitChanges(); @@ -881,7 +879,7 @@ bool ConfigItem::SetSetProperties( { SAL_WARN( "unotools.config", - "Exception from SetSetProperties: " << rEx.Message); + "Exception from SetSetProperties: " << rEx); bRet = false; } } @@ -961,7 +959,7 @@ bool ConfigItem::ReplaceSetProperties( { SAL_WARN( "unotools.config", - "Exception from commitChanges(): " << e.Message); + "Exception from commitChanges(): " << e); } } @@ -982,7 +980,7 @@ bool ConfigItem::ReplaceSetProperties( { SAL_WARN( "unotools.config", - "Exception from commitChanges(): " << e.Message); + "Exception from commitChanges(): " << e); } const PropertyValue* pProperties = rValues.getConstArray(); @@ -1021,8 +1019,7 @@ bool ConfigItem::ReplaceSetProperties( { SAL_WARN( "unotools.config", - "Exception from insert/replaceByName(): " - << e.Message); + "Exception from insert/replaceByName(): " << e); } } xBatch->commitChanges(); @@ -1031,8 +1028,7 @@ bool ConfigItem::ReplaceSetProperties( catch (const Exception& rEx) { SAL_WARN( - "unotools.config", - "Exception from ReplaceSetProperties: " << rEx.Message); + "unotools.config", "Exception from ReplaceSetProperties: " << rEx); bRet = false; } } @@ -1076,9 +1072,7 @@ bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) } catch (css::uno::Exception & e) { - SAL_WARN( - "unotools.config", - "Exception from commitChanges(): " << e.Message); + SAL_WARN("unotools.config", "Exception from commitChanges(): " << e); } } else @@ -1091,17 +1085,14 @@ bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) } catch (css::uno::Exception & e) { - SAL_WARN( - "unotools.config", - "Exception from AddNode(): " << e.Message); + SAL_WARN("unotools.config", "Exception from AddNode(): " << e); } } xBatch->commitChanges(); } catch (const Exception& rEx) { - SAL_WARN( - "unotools.config", "Exception from AddNode(): " << rEx.Message); + SAL_WARN("unotools.config", "Exception from AddNode(): " << rEx); bRet = false; } } diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index b4213295c142..e12403f77784 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -117,7 +117,7 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() m_xCfg.clear(); m_xCommonXCU.clear(); - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } } @@ -148,7 +148,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetCapacity(EHistoryType eHistory) } catch (const uno::Exception& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } return nSize; @@ -176,7 +176,7 @@ uno::Reference<container::XNameAccess> SvtHistoryOptions_Impl::GetListAccess(EHi } catch (const uno::Exception& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } return xListAccess; @@ -215,7 +215,7 @@ void SvtHistoryOptions_Impl::impl_truncateList(EHistoryType eHistory, sal_uInt32 } catch(const uno::Exception& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } } @@ -248,7 +248,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) } catch(const uno::Exception& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } } @@ -276,7 +276,7 @@ Sequence< Sequence<PropertyValue> > SvtHistoryOptions_Impl::GetList(EHistoryType } catch(const uno::Exception& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } const sal_Int32 nLength = xOrderList->getElementNames().getLength(); @@ -310,7 +310,7 @@ Sequence< Sequence<PropertyValue> > SvtHistoryOptions_Impl::GetList(EHistoryType // ignore such corrupted individual items here, so that at // least newly added items are successfully reported back // from this function: - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } } assert(nCount <= nLength); @@ -444,7 +444,7 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory, } catch(const uno::Exception& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } } @@ -508,7 +508,7 @@ void SvtHistoryOptions_Impl::DeleteItem(EHistoryType eHistory, const OUString& s } catch (const uno::Exception& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } } diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index a11fd059fead..f3dfcc98af5e 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -64,7 +64,7 @@ ItemHolder1::ItemHolder1() if(bMessage) { bMessage = false; - SAL_WARN( "unotools", "CreateInstance with arguments exception: " << rEx.Message); + SAL_WARN( "unotools", "CreateInstance with arguments exception: " << rEx); } } #else diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 6bdc59f93c4d..998ff53d0072 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -298,7 +298,7 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString& } catch (const Exception& e) { - SAL_WARN("unotools.config", "SetPath: exception: " << e.Message); + SAL_WARN("unotools.config", "SetPath: " << e); } } } diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 625a925b4095..31ce8c9893d0 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -147,7 +147,7 @@ SvtUserOptions::Impl::Impl() : catch (uno::Exception const& ex) { m_xCfg.clear(); - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } } @@ -161,7 +161,7 @@ OUString SvtUserOptions::Impl::GetToken (UserOptToken nToken) const } catch (uno::Exception const& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } return sToken; } @@ -176,7 +176,7 @@ void SvtUserOptions::Impl::SetToken (UserOptToken nToken, OUString const& sToken } catch (uno::Exception const& ex) { - SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message); + SAL_WARN("unotools.config", "Caught unexpected: " << ex); } } |