[Libreoffice-commits] core.git: unotools/source xmlsecurity/source
Jelle van der Waa
jelle at vdwaa.nl
Wed Jul 24 13:18:56 PDT 2013
unotools/source/config/extendedsecurityoptions.cxx | 2 --
unotools/source/config/fltrcfg.cxx | 2 --
unotools/source/config/fontoptions.cxx | 2 --
unotools/source/config/historyoptions.cxx | 2 --
unotools/source/config/localisationoptions.cxx | 2 --
unotools/source/config/misccfg.cxx | 4 ----
unotools/source/config/moduleoptions.cxx | 2 --
unotools/source/config/saveopt.cxx | 2 --
unotools/source/config/searchopt.cxx | 2 --
unotools/source/config/securityoptions.cxx | 2 --
unotools/source/config/syslocaleoptions.cxx | 2 --
unotools/source/config/useroptions.cxx | 2 --
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2 +-
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 1 -
14 files changed, 1 insertion(+), 28 deletions(-)
New commits:
commit ec52a20edbd7243bba041259d93608c2dac4b39c
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Wed Jul 24 21:39:52 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: Ie959aa5a6874aae3c60273355a959c344e82699e
Reviewed-on: https://gerrit.libreoffice.org/5083
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 4fcbbe1..8b1d3a1 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -29,7 +29,6 @@
#include <boost/unordered_map.hpp>
-#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
using namespace ::utl ;
@@ -317,7 +316,6 @@ SvtExtendedSecurityOptions::SvtExtendedSecurityOptions()
// ... and initialize ouer data container only if it not already exist!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtExtendedSecurityOptions_Impl::ctor()");
m_pDataContainer = new SvtExtendedSecurityOptions_Impl;
ItemHolder1::holdConfigItem(E_EXTENDEDSECURITYOPTIONS);
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 1f99d48..29678a1 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -21,7 +21,6 @@
#include <unotools/fltrcfg.hxx>
#include <tools/debug.hxx>
-#include <rtl/logfile.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -300,7 +299,6 @@ SvtFilterOptions::SvtFilterOptions() :
ConfigItem( "Office.Common/Filter/Microsoft" ),
pImp(new SvtFilterOptions_Impl)
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools SvtFilterOptions::SvtFilterOptions()");
EnableNotification(GetPropertyNames());
Load();
}
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index b81c096..c661fd5 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/instance.hxx>
#include "itemholder1.hxx"
@@ -331,7 +330,6 @@ SvtFontOptions::SvtFontOptions()
// ... and initialize ouer data container only if it not already exist!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtFontOptions_Impl::ctor()");
m_pDataContainer = new SvtFontOptions_Impl;
ItemHolder1::holdConfigItem(E_FONTOPTIONS);
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 9c66fbf..5fc3b2a 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -28,7 +28,6 @@
#include <deque>
#include <algorithm>
-#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -590,7 +589,6 @@ SvtHistoryOptions::SvtHistoryOptions()
// ... and initialize ouer data container only if it not already exist!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtHistoryOptions_Impl::ctor()");
m_pDataContainer = new SvtHistoryOptions_Impl;
ItemHolder1::holdConfigItem(E_HISTORYOPTIONS);
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index bd92d3d..1d67f9a 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
using namespace ::utl ;
@@ -291,7 +290,6 @@ SvtLocalisationOptions::SvtLocalisationOptions()
// ... and initialize ouer data container only if it not already exist!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtLocalisationOptions_Impl::ctor()");
m_pDataContainer = new SvtLocalisationOptions_Impl;
ItemHolder1::holdConfigItem(E_LOCALISATIONOPTIONS);
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 569c9f4..62ef5f1 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <osl/mutex.hxx>
-#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
using namespace com::sun::star::uno;
@@ -77,8 +76,6 @@ SfxMiscCfg::SfxMiscCfg() :
bNotFound (sal_False),
nYear2000( 1930 )
{
- RTL_LOGFILE_CONTEXT(aLog, "svl SfxMiscCfg::SfxMiscCfg()");
-
Load();
}
@@ -190,7 +187,6 @@ MiscCfg::MiscCfg( )
::osl::MutexGuard aGuard( LocalSingleton::get() );
if ( !pOptions )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) SfxMiscCfg::ctor()");
pOptions = new SfxMiscCfg;
ItemHolder1::holdConfigItem(E_MISCCFG);
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index bda16c3..45ef57c 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -26,7 +26,6 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/instance.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -1003,7 +1002,6 @@ SvtModuleOptions::SvtModuleOptions()
++m_nRefCount;
if( m_nRefCount == 1 )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtModuleOptions_Impl::ctor()");
m_pDataContainer = new SvtModuleOptions_Impl();
ItemHolder1::holdConfigItem(E_MODULEOPTIONS);
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 9a25220..6ff1252 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -28,7 +28,6 @@
#include <osl/mutex.hxx>
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
-#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
using namespace utl;
@@ -857,7 +856,6 @@ SvtSaveOptions::SvtSaveOptions()
::osl::MutexGuard aGuard( LocalSingleton::get() );
if ( !pOptions )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtSaveOptions_Impl::ctor()");
pOptions = new SvtLoadSaveOptions_Impl;
pOptions->pSaveOpt = new SvtSaveOptions_Impl;
pOptions->pLoadOpt = new SvtLoadOptions_Impl;
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 228a7b9..f4fc0b2 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Any.h>
-#include <rtl/logfile.hxx>
#include <sal/macros.h>
@@ -75,7 +74,6 @@ public:
SvtSearchOptions_Impl::SvtSearchOptions_Impl() :
ConfigItem( OUString("Office.Common/SearchOptions") )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools SvtSearchOptions_Impl::SvtSearchOptions_Impl()");
nFlags = 0x0003FFFF; // set all options values to 'true'
Load();
SetModified( sal_False );
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 3abe34a..a10418c 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -32,7 +32,6 @@
#include <unotools/pathoptions.hxx>
-#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
//_________________________________________________________________________________________________________________
@@ -1045,7 +1044,6 @@ SvtSecurityOptions::SvtSecurityOptions()
// ... and initialize ouer data container only if it not already exist!
if( m_pDataContainer == NULL )
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtSecurityOptions_Impl::ctor()");
m_pDataContainer = new SvtSecurityOptions_Impl;
ItemHolder1::holdConfigItem(E_SECURITYOPTIONS);
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index fbab88b..561cb20 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -20,7 +20,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <tools/string.hxx>
@@ -531,7 +530,6 @@ SvtSysLocaleOptions::SvtSysLocaleOptions()
MutexGuard aGuard( GetMutex() );
if ( !pOptions )
{
- RTL_LOGFILE_CONTEXT(aLog, "svl ( ??? ) ::SvtSysLocaleOptions_Impl::ctor()");
pOptions = new SvtSysLocaleOptions_Impl;
ItemHolder1::holdConfigItem(E_SYSLOCALEOPTIONS);
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index ac0e606..01ae9e6 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -26,7 +26,6 @@
#include <tools/solar.h>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
#include <com/sun/star/beans/Property.hpp>
@@ -254,7 +253,6 @@ SvtUserOptions::SvtUserOptions ()
if (pSharedImpl.expired())
{
- RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) SvtUserOptions::Impl::ctor()");
pImpl.reset(new Impl);
pSharedImpl = pImpl;
ItemHolder1::holdConfigItem(E_USEROPTIONS);
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 08c020d..5157b24 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -447,7 +447,7 @@ void SecurityEnvironment_NssImpl::updateSlots()
// if( pSymKey == NULL )
// {
// PK11_FreeSlot( pSlot ) ;
-// RTL_LOGFILE_TRACE( "XMLSEC: Error - pSymKey is NULL" );
+// SAL_INFO( "xmlsecurity", "XMLSEC: Error - pSymKey is NULL" );
// continue;
// }
addCryptoSlot(pSlot);
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 41c2378..813d07d 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -32,7 +32,6 @@
#include <rtl/strbuf.hxx>
#include <osl/file.hxx>
#include <osl/thread.h>
-#include <rtl/logfile.hxx>
#include <com/sun/star/xml/crypto/SecurityEnvironment.hpp>
#include <com/sun/star/xml/crypto/XMLSecurityContext.hpp>
More information about the Libreoffice-commits
mailing list