include/sal/log-areas.dox | 6 ++++++ sfx2/inc/pch/precompiled_sfx.hxx | 1 - sfx2/source/appl/appopen.cxx | 3 +-- sfx2/source/appl/imagemgr.cxx | 1 - sfx2/source/doc/objcont.cxx | 3 +-- sfx2/source/doc/sfxbasemodel.cxx | 7 ++----- 6 files changed, 10 insertions(+), 11 deletions(-)
New commits: commit f85fc1cdda3e84b05cefa1d6ca4e666bb76500cc Author: Jelle van der Waa <je...@vdwaa.nl> Date: Tue Jul 23 21:46:39 2013 +0200 fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO Change-Id: I41efcb94121a005d9f44cc17e8ecb5598e8ffba8 Reviewed-on: https://gerrit.libreoffice.org/5057 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 6622069..04b7ad2 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -201,6 +201,12 @@ certain functionality. @li @c sdext.pdfimport.pdfparse @li @c sdext.presenter +@section sfx2 + +@li @c sfx2 +@li @c sfx2.doc +@li @c sfx2.appl + @section sfx @li @c sfx diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 53a4811..652bb13 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -620,7 +620,6 @@ #include <rsc/rscsfx.hxx> #include <rtl/bootstrap.hxx> #include <rtl/instance.hxx> -#include <rtl/logfile.hxx> #include <rtl/math.hxx> #include <rtl/random.h> #include <rtl/ref.hxx> diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 3c12835..b05b714 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -75,7 +75,6 @@ #include <osl/mutex.hxx> -#include <rtl/logfile.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> @@ -1127,7 +1126,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) Reference < XDispatchProvider > xProv( xTargetFrame, UNO_QUERY ); Reference < XDispatch > xDisp = xProv.is() ? xProv->queryDispatch( aURL, aTarget, FrameSearchFlag::ALL ) : Reference < XDispatch >();; - RTL_LOGFILE_PRODUCT_CONTEXT( aLog2, "PERFORMANCE - SfxApplication::OpenDocExec_Impl" ); + SAL_INFO( "sfx2.appl", "PERFORMANCE - SfxApplication::OpenDocExec_Impl" ); if ( xDisp.is() ) xDisp->dispatch( aURL, aArgs ); } diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 67e4406..a19e7bc 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -29,7 +29,6 @@ #include <svtools/imagemgr.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustring.hxx> -#include <rtl/logfile.hxx> #include "sfx2/imgmgr.hxx" #include <sfx2/app.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 8118369..15c98d9f 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -41,7 +41,6 @@ #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <tools/datetime.hxx> -#include <rtl/logfile.hxx> #include <rtl/uri.hxx> #include <math.h> @@ -164,7 +163,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const aDevice.SetDigitLanguage( eLang ); { - RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::CreatePreviewMetaFile_Impl" ); + SAL_INFO( "sfx2.doc", "PERFORMANCE SfxObjectShell::CreatePreviewMetaFile_Impl" ); ((SfxObjectShell*)this)->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), nAspect ); } pFile->Stop(); diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 634b4c4..5efb2b4 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -74,7 +74,6 @@ #include <svtools/transfer.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> -#include <rtl/logfile.hxx> #include <rtl/strbuf.hxx> #include <framework/configimporter.hxx> #include <framework/interaction.hxx> @@ -1556,8 +1555,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > io::IOException, RuntimeException ) { - RTL_LOGFILE_PRODUCT_CONTEXT( aPerfLog, "PERFORMANCE - SfxBaseModel::storeSelf" ); - + SAL_INFO( "sfx2.doc", "PERFORMANCE - SfxBaseModel::storeSelf" ); SfxModelGuard aGuard( *this ); if ( m_pData->m_pObjectShell.Is() ) @@ -1685,8 +1683,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL const Sequence< beans::PropertyValue >& rArgs ) throw (io::IOException, RuntimeException) { - RTL_LOGFILE_PRODUCT_CONTEXT( aPerfLog, "PERFORMANCE - SfxBaseModel::storeAsURL" ); - + SAL_INFO( "sfx2.doc", "PERFORMANCE - SfxBaseModel::storeAsURL" ); SfxModelGuard aGuard( *this ); if ( m_pData->m_pObjectShell.Is() ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits