Skip to content

C
core
Kaydet (Commit) b772e2f0 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Unwound unhelpful LogHelper::logIt 

...where the OSL_FAIL line numbers did not point at the relevant code.

Change-Id: I4d12d63782378cbbc446cdcd77c07676ffc81d78
üst d31e409e
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 131 deletions
svtools/source/config/accessibilityoptions.cxx
Dosyayı görüntüle @ b772e2f0
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp>
#include <comphelper/configurationhelper.hxx> #include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <unotools/loghelper.hxx>
#include <svl/smplhint.hxx> #include <svl/smplhint.hxx>
...@@ -134,7 +133,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl() ...@@ -134,7 +133,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
m_xCfg.clear(); m_xCfg.clear();
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -155,7 +154,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC() ...@@ -155,7 +154,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -173,7 +172,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const ...@@ -173,7 +172,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
} }
...@@ -190,7 +189,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const ...@@ -190,7 +189,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -208,7 +207,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const ...@@ -208,7 +207,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -226,7 +225,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const ...@@ -226,7 +225,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -244,7 +243,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const ...@@ -244,7 +243,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -262,7 +261,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const ...@@ -262,7 +261,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -280,7 +279,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const ...@@ -280,7 +279,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return nRet; return nRet;
...@@ -298,7 +297,7 @@ sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const ...@@ -298,7 +297,7 @@ sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -320,7 +319,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet) ...@@ -320,7 +319,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -340,7 +339,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet) ...@@ -340,7 +339,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -360,7 +359,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet) ...@@ -360,7 +359,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -380,7 +379,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet) ...@@ -380,7 +379,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -400,7 +399,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet) ...@@ -400,7 +399,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -420,7 +419,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet) ...@@ -420,7 +419,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -440,7 +439,7 @@ void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet) ...@@ -440,7 +439,7 @@ void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -460,7 +459,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet) ...@@ -460,7 +459,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -480,7 +479,7 @@ void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet) ...@@ -480,7 +479,7 @@ void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet)
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
......
svtools/source/config/printoptions.cxx
Dosyayı görüntüle @ b772e2f0
...@@ -50,8 +50,6 @@ ...@@ -50,8 +50,6 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <unotools/loghelper.hxx>
#include <itemholder2.hxx> #include <itemholder2.hxx>
#include <sal/macros.h> #include <sal/macros.h>
...@@ -188,7 +186,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot) ...@@ -188,7 +186,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
{ {
m_xNode.clear(); m_xNode.clear();
m_xCfg.clear(); m_xCfg.clear();
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -206,7 +204,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceTransparency() const ...@@ -206,7 +204,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceTransparency() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -226,7 +224,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const ...@@ -226,7 +224,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return nRet; return nRet;
...@@ -248,7 +246,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceGradients() const ...@@ -248,7 +246,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceGradients() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -270,7 +268,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientMode() const ...@@ -270,7 +268,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientMode() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return nRet; return nRet;
...@@ -292,7 +290,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const ...@@ -292,7 +290,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return nRet; return nRet;
...@@ -314,7 +312,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceBitmaps() const ...@@ -314,7 +312,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceBitmaps() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -336,7 +334,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapMode() const ...@@ -336,7 +334,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapMode() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return nRet; return nRet;
...@@ -358,7 +356,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const ...@@ -358,7 +356,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return nRet; return nRet;
...@@ -380,7 +378,7 @@ sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const ...@@ -380,7 +378,7 @@ sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -402,7 +400,7 @@ sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const ...@@ -402,7 +400,7 @@ sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
} }
catch (const css::uno::Exception& ex) catch (const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
return bRet; return bRet;
...@@ -489,7 +487,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, ...@@ -489,7 +487,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -517,7 +515,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, ...@@ -517,7 +515,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
} }
} }
......
unotools/Package_inc.mk
Dosyayı görüntüle @ b772e2f0
...@@ -69,7 +69,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/linguprops.hxx,unoto ...@@ -69,7 +69,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/linguprops.hxx,unoto
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localedatawrapper.hxx,unotools/localedatawrapper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localedatawrapper.hxx,unotools/localedatawrapper.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localfilehelper.hxx,unotools/localfilehelper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localfilehelper.hxx,unotools/localfilehelper.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localisationoptions.hxx,unotools/localisationoptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localisationoptions.hxx,unotools/localisationoptions.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/loghelper.hxx,unotools/loghelper.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/misccfg.hxx,unotools/misccfg.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/misccfg.hxx,unotools/misccfg.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/moduleoptions.hxx,unotools/moduleoptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/moduleoptions.hxx,unotools/moduleoptions.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/nativenumberwrapper.hxx,unotools/nativenumberwrapper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/nativenumberwrapper.hxx,unotools/nativenumberwrapper.hxx))
......
unotools/inc/unotools/loghelper.hxx deleted 100644 → 0
Dosyayı görüntüle @ d31e409e
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _SVT_LOGHELPER_HXX
#define _SVT_LOGHELPER_HXX
namespace css = ::com::sun::star;
namespace LogHelper {
inline void logIt(const css::uno::Exception& ex)
{
::rtl::OUStringBuffer sMsg(256);
sMsg.appendAscii("Unexpected exception catched. Original message was:\n\"" );
sMsg.append(ex.Message);
sMsg.appendAscii("\"");
OSL_FAIL(::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
}
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
unotools/source/config/historyoptions.cxx
Dosyayı görüntüle @ b772e2f0
...@@ -52,8 +52,6 @@ ...@@ -52,8 +52,6 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <unotools/loghelper.hxx>
using namespace ::std ; using namespace ::std ;
using namespace ::utl ; using namespace ::utl ;
using namespace ::rtl ; using namespace ::rtl ;
...@@ -167,7 +165,7 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() ...@@ -167,7 +165,7 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
m_xCfg.clear(); m_xCfg.clear();
m_xCommonXCU.clear(); m_xCommonXCU.clear();
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -213,7 +211,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory ) ...@@ -213,7 +211,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return nSize; return nSize;
...@@ -273,7 +271,7 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt ...@@ -273,7 +271,7 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -333,7 +331,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) ...@@ -333,7 +331,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -418,7 +416,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT ...@@ -418,7 +416,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
// ignore such corrupted individual items here, so that at // ignore such corrupted individual items here, so that at
// least newly added items are successfully reported back // least newly added items are successfully reported back
// from this function: // from this function:
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
assert(nCount <= nLength); assert(nCount <= nLength);
...@@ -428,7 +426,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT ...@@ -428,7 +426,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return seqReturn; return seqReturn;
...@@ -569,7 +567,7 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , ...@@ -569,7 +567,7 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory ,
} }
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
......
unotools/source/config/useroptions.cxx
Dosyayı görüntüle @ b772e2f0
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
#include <com/sun/star/util/ChangesEvent.hpp> #include <com/sun/star/util/ChangesEvent.hpp>
#include <comphelper/configurationhelper.hxx> #include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <unotools/loghelper.hxx>
using namespace utl; using namespace utl;
using namespace com::sun::star; using namespace com::sun::star;
...@@ -219,7 +218,7 @@ SvtUserOptions_Impl::SvtUserOptions_Impl() : ...@@ -219,7 +218,7 @@ SvtUserOptions_Impl::SvtUserOptions_Impl() :
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
m_xCfg.clear(); m_xCfg.clear();
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -240,7 +239,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -240,7 +239,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sCompany; return sCompany;
...@@ -257,7 +256,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -257,7 +256,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sFirstName; return sFirstName;
...@@ -274,7 +273,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -274,7 +273,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sLastName; return sLastName;
...@@ -291,7 +290,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -291,7 +290,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sID; return sID;
...@@ -308,7 +307,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -308,7 +307,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sStreet; return sStreet;
...@@ -325,7 +324,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -325,7 +324,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sCity; return sCity;
...@@ -342,7 +341,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -342,7 +341,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sState; return sState;
...@@ -359,7 +358,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -359,7 +358,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sZip; return sZip;
...@@ -376,7 +375,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -376,7 +375,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sCountry; return sCountry;
...@@ -393,7 +392,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -393,7 +392,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sPosition; return sPosition;
...@@ -410,7 +409,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -410,7 +409,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sTitle; return sTitle;
...@@ -427,7 +426,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -427,7 +426,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sTelephoneHome; return sTelephoneHome;
...@@ -444,7 +443,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -444,7 +443,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sTelephoneWork; return sTelephoneWork;
...@@ -461,7 +460,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -461,7 +460,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sFax; return sFax;
...@@ -478,7 +477,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -478,7 +477,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sEmail; return sEmail;
...@@ -495,7 +494,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -495,7 +494,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sCustomerNumber; return sCustomerNumber;
...@@ -512,7 +511,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -512,7 +511,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sFathersName; return sFathersName;
...@@ -529,7 +528,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl() ...@@ -529,7 +528,7 @@ SvtUserOptions_Impl::~SvtUserOptions_Impl()
} }
catch ( const css::uno::Exception& ex ) catch ( const css::uno::Exception& ex )
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
return sApartment; return sApartment;
...@@ -545,7 +544,7 @@ void SvtUserOptions_Impl::SetCompany( const ::rtl::OUString& sCompany ) ...@@ -545,7 +544,7 @@ void SvtUserOptions_Impl::SetCompany( const ::rtl::OUString& sCompany )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -559,7 +558,7 @@ void SvtUserOptions_Impl::SetFirstName( const ::rtl::OUString& sFirstName ) ...@@ -559,7 +558,7 @@ void SvtUserOptions_Impl::SetFirstName( const ::rtl::OUString& sFirstName )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -573,7 +572,7 @@ void SvtUserOptions_Impl::SetLastName( const ::rtl::OUString& sLastName ) ...@@ -573,7 +572,7 @@ void SvtUserOptions_Impl::SetLastName( const ::rtl::OUString& sLastName )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
void SvtUserOptions_Impl::SetID( const ::rtl::OUString& sID ) void SvtUserOptions_Impl::SetID( const ::rtl::OUString& sID )
...@@ -586,7 +585,7 @@ void SvtUserOptions_Impl::SetID( const ::rtl::OUString& sID ) ...@@ -586,7 +585,7 @@ void SvtUserOptions_Impl::SetID( const ::rtl::OUString& sID )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -600,7 +599,7 @@ void SvtUserOptions_Impl::SetStreet( const ::rtl::OUString& sStreet ) ...@@ -600,7 +599,7 @@ void SvtUserOptions_Impl::SetStreet( const ::rtl::OUString& sStreet )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -614,7 +613,7 @@ void SvtUserOptions_Impl::SetCity( const ::rtl::OUString& sCity ) ...@@ -614,7 +613,7 @@ void SvtUserOptions_Impl::SetCity( const ::rtl::OUString& sCity )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -628,7 +627,7 @@ void SvtUserOptions_Impl::SetState( const ::rtl::OUString& sState ) ...@@ -628,7 +627,7 @@ void SvtUserOptions_Impl::SetState( const ::rtl::OUString& sState )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -642,7 +641,7 @@ void SvtUserOptions_Impl::SetZip( const ::rtl::OUString& sZip ) ...@@ -642,7 +641,7 @@ void SvtUserOptions_Impl::SetZip( const ::rtl::OUString& sZip )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -656,7 +655,7 @@ void SvtUserOptions_Impl::SetCountry( const ::rtl::OUString& sCountry ) ...@@ -656,7 +655,7 @@ void SvtUserOptions_Impl::SetCountry( const ::rtl::OUString& sCountry )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -670,7 +669,7 @@ void SvtUserOptions_Impl::SetPosition( const ::rtl::OUString& sPosition ) ...@@ -670,7 +669,7 @@ void SvtUserOptions_Impl::SetPosition( const ::rtl::OUString& sPosition )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -684,7 +683,7 @@ void SvtUserOptions_Impl::SetTitle( const ::rtl::OUString& sTitle ) ...@@ -684,7 +683,7 @@ void SvtUserOptions_Impl::SetTitle( const ::rtl::OUString& sTitle )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -698,7 +697,7 @@ void SvtUserOptions_Impl::SetTelephoneHome( const ::rtl::OUString& sTelephoneHom ...@@ -698,7 +697,7 @@ void SvtUserOptions_Impl::SetTelephoneHome( const ::rtl::OUString& sTelephoneHom
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -712,7 +711,7 @@ void SvtUserOptions_Impl::SetTelephoneWork( const ::rtl::OUString& sTelephoneWor ...@@ -712,7 +711,7 @@ void SvtUserOptions_Impl::SetTelephoneWork( const ::rtl::OUString& sTelephoneWor
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -726,7 +725,7 @@ void SvtUserOptions_Impl::SetFax( const ::rtl::OUString& sFax ) ...@@ -726,7 +725,7 @@ void SvtUserOptions_Impl::SetFax( const ::rtl::OUString& sFax )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -740,7 +739,7 @@ void SvtUserOptions_Impl::SetEmail( const ::rtl::OUString& sEmail ) ...@@ -740,7 +739,7 @@ void SvtUserOptions_Impl::SetEmail( const ::rtl::OUString& sEmail )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -754,7 +753,7 @@ void SvtUserOptions_Impl::SetCustomerNumber( const ::rtl::OUString& sCustomerNum ...@@ -754,7 +753,7 @@ void SvtUserOptions_Impl::SetCustomerNumber( const ::rtl::OUString& sCustomerNum
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -768,7 +767,7 @@ void SvtUserOptions_Impl::SetFathersName( const ::rtl::OUString& sFathersName ) ...@@ -768,7 +767,7 @@ void SvtUserOptions_Impl::SetFathersName( const ::rtl::OUString& sFathersName )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
...@@ -782,7 +781,7 @@ void SvtUserOptions_Impl::SetApartment( const ::rtl::OUString& sApartment ) ...@@ -782,7 +781,7 @@ void SvtUserOptions_Impl::SetApartment( const ::rtl::OUString& sApartment )
} }
catch ( const css::uno::Exception& ex) catch ( const css::uno::Exception& ex)
{ {
LogHelper::logIt(ex); SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment