svl/source/numbers/zforlist.cxx | 7 +------
svtools/inc/pch/precompiled_svt.hxx | 1 -
svtools/source/config/apearcfg.cxx | 3 ---
svtools/source/config/fontsubstconfig.cxx | 3 ---
svtools/source/config/helpopt.cxx | 2 --
svtools/source/config/menuoptions.cxx | 2 --
svtools/source/config/miscopt.cxx | 2 --
svtools/source/config/slidesorterbaropt.cxx | 2 --
svtools/source/config/toolpanelopt.cxx | 2 --
svtools/source/misc/embedhlp.cxx | 6 ++----
svtools/source/misc/imagemgr.cxx | 5 -----
svtools/source/uno/popupmenucontrollerbase.cxx | 1 -
12 files changed, 3 insertions(+), 33 deletions(-)
New commits:
commit c0cffa68488afd07fa99f74631ae121aa87a7d32
Author: Jelle van der Waa <je...@vdwaa.nl>
Date: Wed Jul 24 22:26:27 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: I74d3db1c53609c6079c63e3f04531a87da1dda9d
Reviewed-on: https://gerrit.libreoffice.org/5084
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 00a9a35..0442261 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -40,7 +40,6 @@
#include <unotools/syslocaleoptions.hxx>
#include <unotools/digitgroupingiterator.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/instance.hxx>
#include <rtl/strbuf.hxx>
@@ -220,8 +219,6 @@ SvNumberFormatter::~SvNumberFormatter()
void SvNumberFormatter::ImpConstruct( LanguageType eLang )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svl", "er93726",
"SvNumberFormatter::ImpConstruct" );
-
if ( eLang == LANGUAGE_DONTKNOW )
{
eLang = UNKNOWN_SUBSTITUTE;
@@ -3673,8 +3670,6 @@ void SvNumberFormatter::ImpInitCurrencyTable()
}
bInitializing = true;
- RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svl", "er93726",
"SvNumberFormatter::ImpInitCurrencyTable" );
-
LanguageType eSysLang = SvtSysLocale().GetLanguageTag().getLanguageType();
LocaleDataWrapper* pLocaleData = new LocaleDataWrapper(
::comphelper::getProcessComponentContext(),
@@ -3696,7 +3691,7 @@ void SvNumberFormatter::ImpInitCurrencyTable()
::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > xLoc =
LocaleDataWrapper::getInstalledLocaleNames();
sal_Int32 nLocaleCount = xLoc.getLength();
- RTL_LOGFILE_CONTEXT_TRACE1( aTimeLog, "number of locales: %ld",
nLocaleCount );
+ SAL_INFO( "svl.numbers", "number of locales: \"" << nLocaleCount << "\"" );
Locale const * const pLocales = xLoc.getConstArray();
NfCurrencyTable &rCurrencyTable = theCurrencyTable::get();
NfCurrencyTable &rLegacyOnlyCurrencyTable =
theLegacyOnlyCurrencyTable::get();
diff --git a/svtools/inc/pch/precompiled_svt.hxx
b/svtools/inc/pch/precompiled_svt.hxx
index e6b7d39..e8df2b1 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -318,7 +318,6 @@
#include <rtl/bootstrap.hxx>
#include <rtl/crc.h>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <rtl/ref.hxx>
#include <rtl/strbuf.hxx>
diff --git a/svtools/source/config/apearcfg.cxx
b/svtools/source/config/apearcfg.cxx
index fe09f97..b24c200 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -24,7 +24,6 @@
#include "tools/debug.hxx"
#include "vcl/settings.hxx"
#include "vcl/svapp.hxx"
-#include <rtl/logfile.hxx>
#include <sal/macros.h>
#define DEFAULT_DRAGMODE 2
@@ -53,8 +52,6 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
,bFontAntialiasing ( sal_True )
#endif
{
- RTL_LOGFILE_CONTEXT(aLog, "svtools
SvtTabAppearanceCfg::SvtTabAppearanceCfg()");
-
const Sequence<OUString>& rNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(rNames);
const Any* pValues = aValues.getConstArray();
diff --git a/svtools/source/config/fontsubstconfig.cxx
b/svtools/source/config/fontsubstconfig.cxx
index b3ccb4f..eb189e4 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/debug.hxx>
#include <vcl/outdev.hxx>
-#include <rtl/logfile.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
@@ -53,8 +52,6 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
bIsEnabled(sal_False),
pImpl(new SvtFontSubstConfig_Impl)
{
- RTL_LOGFILE_CONTEXT(aLog, "svtools
SvtFontSubstConfig::SvtFontSubstConfig()");
-
Sequence<OUString> aNames(1);
aNames.getArray()[0] = cReplacement;
Sequence<Any> aValues = GetProperties(aNames);
diff --git a/svtools/source/config/helpopt.cxx
b/svtools/source/config/helpopt.cxx
index a51ed04..aa1a874 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -28,7 +28,6 @@
#include <osl/mutex.hxx>
#include <comphelper/stl_types.hxx>
-#include <rtl/logfile.hxx>
#include "itemholder2.hxx"
using namespace utl;
@@ -264,7 +263,6 @@ SvtHelpOptions::SvtHelpOptions()
++nRefCount;
if ( !pOptions )
{
- RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? )
::SvtHelpOptions_Impl::ctor()");
pOptions = new SvtHelpOptions_Impl;
svtools::ItemHolder2::holdConfigItem(E_HELPOPTIONS);
diff --git a/svtools/source/config/menuoptions.cxx
b/svtools/source/config/menuoptions.cxx
index b5cba7f..1a320b1 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
#include "itemholder2.hxx"
#include <list>
@@ -441,7 +440,6 @@ SvtMenuOptions::SvtMenuOptions()
// ... and initialize our data container only if it not already!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? )
::SvtMenuOptions_Impl::ctor()");
m_pDataContainer = new SvtMenuOptions_Impl();
svtools::ItemHolder2::holdConfigItem(E_MENUOPTIONS);
diff --git a/svtools/source/config/miscopt.cxx
b/svtools/source/config/miscopt.cxx
index 4ac2f9f..fc5aac8 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/link.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/instance.hxx>
#include "itemholder2.hxx"
@@ -748,7 +747,6 @@ SvtMiscOptions::SvtMiscOptions()
// ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? )
::SvtMiscOptions_Impl::ctor()");
m_pDataContainer = new SvtMiscOptions_Impl;
svtools::ItemHolder2::holdConfigItem(E_MISCOPTIONS);
}
diff --git a/svtools/source/config/slidesorterbaropt.cxx
b/svtools/source/config/slidesorterbaropt.cxx
index cf0208e..9ef89c8 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/instance.hxx>
using namespace ::utl;
@@ -334,7 +333,6 @@ SvtSlideSorterBarOptions::SvtSlideSorterBarOptions()
// ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? )
::SvtSlideSorterBarOptions_Impl::ctor()");
m_pDataContainer = new SvtSlideSorterBarOptions_Impl;
}
}
diff --git a/svtools/source/config/toolpanelopt.cxx
b/svtools/source/config/toolpanelopt.cxx
index 2e62765..7c52735 100644
--- a/svtools/source/config/toolpanelopt.cxx
+++ b/svtools/source/config/toolpanelopt.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/link.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/instance.hxx>
#include "itemholder2.hxx"
@@ -318,7 +317,6 @@ SvtToolPanelOptions::SvtToolPanelOptions()
// ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? )
::SvtToolPanelOptions_Impl::ctor()");
m_pDataContainer = new SvtToolPanelOptions_Impl;
}
}
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 6a88fa1..651a27e 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -43,7 +43,6 @@
#include <com/sun/star/chart2/XDefaultSizeTransmitter.hpp>
#include <cppuhelper/implbase4.hxx>
#include "vcl/svapp.hxx"
-#include <rtl/logfile.hxx>
#include <osl/mutex.hxx>
using namespace com::sun::star;
@@ -566,12 +565,11 @@ void EmbeddedObjectRef::SetGraphic( const Graphic&
rGraphic, const OUString& rMe
SvStream* EmbeddedObjectRef::GetGraphicStream( bool bUpdate ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "svtools (mv76033)
svt::EmbeddedObjectRef::GetGraphicStream" );
DBG_ASSERT( bUpdate || mpImpl->pContainer, "Can't retrieve current
graphic!" );
uno::Reference < io::XInputStream > xStream;
if ( mpImpl->pContainer && !bUpdate )
{
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "getting stream from container" );
+ SAL_INFO( "svtools.misc", "getting stream from container" );
// try to get graphic stream from container storage
xStream = mpImpl->pContainer->GetGraphicStream(mpImpl->mxObj,
&mpImpl->aMediaType);
if ( xStream.is() )
@@ -602,7 +600,7 @@ SvStream* EmbeddedObjectRef::GetGraphicStream( bool bUpdate
) const
if ( !xStream.is() )
{
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "getting stream from object" );
+ SAL_INFO( "svtools.misc", "getting stream from object" );
// update wanted or no stream in container storage available
xStream = GetGraphicReplacementStream(mpImpl->nViewAspect,
mpImpl->mxObj, &mpImpl->aMediaType);
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 286fd7a..6a828f4 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <ucbhelper/content.hxx>
#include <tools/rcid.h>
-#include <rtl/logfile.hxx>
#include <unotools/configmgr.hxx>
#include <svtools/svtools.hrc>
#include <svtools/imagemgr.hrc>
@@ -357,8 +356,6 @@ static sal_uInt16 GetFolderImageId_Impl( const String& rURL
)
static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, sal_Bool
bDetectFolder )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svtools", "hb93813",
"SvFileInformationManager::GetImageId_Impl()" );
-
String aExt, sURL = rObject.GetMainURL( INetURLObject::NO_DECODE );
sal_uInt16 nImage = IMG_FILE;
@@ -527,8 +524,6 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId,
sal_Bool bBig )
String SvFileInformationManager::GetDescription_Impl( const INetURLObject&
rObject, sal_Bool bDetectFolder )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svtools", "hb93813",
"SvFileInformationManager::GetDescription_Impl()" );
-
OUString sExtension(rObject.getExtension());
String sDescription, sURL( rObject.GetMainURL( INetURLObject::NO_DECODE )
);
sal_uInt16 nResId = 0;
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx
b/svtools/source/uno/popupmenucontrollerbase.cxx
index a29dd2e..952b304 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -29,7 +29,6 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
#include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
