vcl/inc/pch/precompiled_vcl.hxx | 1 -
vcl/source/app/svmain.cxx | 8 ++++----
vcl/source/filter/graphicfilter.cxx | 5 ++---
vcl/source/gdi/image.cxx | 7 +++----
vcl/source/gdi/outdev3.cxx | 2 +-
vcl/source/helper/canvastools.cxx | 5 ++---
vcl/source/window/toolbox.cxx | 3 +--
vcl/win/source/gdi/salgdi3.cxx | 9 +--------
8 files changed, 14 insertions(+), 26 deletions(-)
New commits:
commit 7650a82702ec9d13e3a52ea84b9666ee4e9f9a62
Author: Jelle van der Waa <je...@vdwaa.nl>
Date: Sat Jul 13 15:08:03 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: I85a3cfeac16e2c8e20724e1f6a5dd16c2c143a49
Reviewed-on: https://gerrit.libreoffice.org/4882
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 8b49d62..76d533e 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -321,7 +321,6 @@
#include <rtl/crc.h>
#include <rtl/digest.h>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/math.h>
#include <rtl/math.hxx>
#include <rtl/process.h>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index e2766b0..f9d571f 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -145,7 +145,7 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void*
/*pData*/, oslSignalInfo
int ImplSVMain()
{
// The 'real' SVMain()
- RTL_LOGFILE_CONTEXT( aLog, "vcl (ss112471) ::SVMain" );
+ SAL_INFO( "vcl.app", "vcl (ss112471) ::SVMain" );
ImplSVData* pSVData = ImplGetSVData();
@@ -241,7 +241,7 @@ uno::Any SAL_CALL
DesktopEnvironmentContext::getValueByName( const OUString& Nam
bool InitVCL()
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl (ss112471) ::InitVCL" );
+ SAL_INFO( "vcl.app", "vcl (ss112471) ::InitVCL" );
if( pExceptionHandler != NULL )
return false;
@@ -266,11 +266,11 @@ bool InitVCL()
pSVData->mnMainThreadId = ::osl::Thread::getCurrentIdentifier();
// Initialize Sal
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ ::CreateSalInstance" );
+ SAL_INFO( "vcl.app", "{ ::CreateSalInstance" );
pSVData->mpDefInst = CreateSalInstance();
if ( !pSVData->mpDefInst )
return false;
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "} ::CreateSalInstance" );
+ SAL_INFO( "vcl.app", "} ::CreateSalInstance" );
// Desktop Environment context (to be able to get value of
"system.desktop-environment" as soon as possible)
com::sun::star::uno::setCurrentContext(
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index eb38d56..650609c 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -57,7 +57,6 @@
#include <unotools/localfilehelper.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include <vcl/metaact.hxx>
#include <vector>
@@ -1739,7 +1738,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic&
rGraphic, const INetURLO
return GRFILTER_FORMATERROR;
#else
- RTL_LOGFILE_CONTEXT( aLog, "GraphicFilter::ExportGraphic() (thb)" );
+ SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID,
"GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID" );
bool bAlreadyExists = DirEntryExists( rPath );
@@ -1789,7 +1788,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic&
rGraphic, const String&
return GRFILTER_FORMATERROR;
#else
- RTL_LOGFILE_CONTEXT( aLog, "GraphicFilter::ExportGraphic() (thb)" );
+ SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
sal_uInt16 nFormatCount = GetExportFormatCount();
ResetLastError();
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index e508b2c..0e33a63 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -20,7 +20,6 @@
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
-#include <rtl/logfile.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
@@ -296,7 +295,7 @@ ImageList::ImageList( const ResId& rResId ) :
mnInitSize( 1 ),
mnGrowSize( 4 )
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::ImageList( const ResId& rResId
)" );
+ SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList( const ResId& rResId )" );
DBG_CTOR( ImageList, NULL );
@@ -346,7 +345,7 @@ ImageList::ImageList( const ::std::vector< OUString >&
rNameVector,
mnInitSize( 1 ),
mnGrowSize( 4 )
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::ImageList(const vector<
OUString >& ..." );
+ SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList(const vector< OUString >&
..." );
DBG_CTOR( ImageList, NULL );
@@ -675,7 +674,7 @@ OUString ImageList::GetImageName( sal_uInt16 nPos ) const
void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::GetImageNames" );
+ SAL_INFO( "vcl.gdi", "vcl: ImageList::GetImageNames" );
DBG_CHKTHIS( ImageList, NULL );
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 8f67176..e023c81 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2833,7 +2833,7 @@ void OutputDevice::ImplInitFontList() const
{
if( mpGraphics || ImplGetGraphics() )
{
- RTL_LOGFILE_CONTEXT( aLog, "OutputDevice::ImplInitFontList()" );
+ SAL_INFO( "vcl.gdi", "OutputDevice::ImplInitFontList()" );
mpGraphics->GetDevFontList( mpFontList );
}
}
diff --git a/vcl/source/helper/canvastools.cxx
b/vcl/source/helper/canvastools.cxx
index 9ba85d0..519f97f 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -18,7 +18,6 @@
*/
-#include <rtl/logfile.hxx>
#include <cppuhelper/compbase1.hxx>
#include <com/sun/star/geometry/RealSize2D.hpp>
@@ -73,7 +72,7 @@ namespace vcl
uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const
uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/,
const
::BitmapEx& inputBitmap )
{
- RTL_LOGFILE_CONTEXT( aLog,
"::vcl::unotools::xBitmapFromBitmapEx()" );
+ SAL_INFO( "vcl.helper", "::vcl::unotools::xBitmapFromBitmapEx()" );
return new vcl::unotools::VclCanvasBitmap( inputBitmap );
}
@@ -189,7 +188,7 @@ namespace vcl
::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const uno::Reference<
rendering::XIntegerReadOnlyBitmap >& xInputBitmap )
{
- RTL_LOGFILE_CONTEXT( aLog,
"::vcl::unotools::bitmapExFromXBitmap()" );
+ SAL_INFO( "vcl.helper", "::vcl::unotools::bitmapExFromXBitmap()" );
if( !xInputBitmap.is() )
return ::BitmapEx();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 1a9d585..c4be486 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -18,7 +18,6 @@
*/
-#include <rtl/logfile.hxx>
#include <tools/debug.hxx>
#include <tools/rc.h>
@@ -1642,7 +1641,7 @@ ToolBox::ToolBox( Window* pParent, WinBits nStyle ) :
ToolBox::ToolBox( Window* pParent, const ResId& rResId ) :
DockingWindow( WINDOW_TOOLBOX )
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ToolBox::ToolBox( Window* pParent, const
ResId& rResId )" );
+ SAL_INFO( "vcl.window", "vcl: ToolBox::ToolBox( Window* pParent, const
ResId& rResId )" );
rResId.SetRT( RSC_TOOLBOX );
WinBits nStyle = ImplInitRes( rResId );
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 33e6493..aa049da 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2112,7 +2112,7 @@ static bool ImplGetFontAttrFromFile( const String&
rFontFileURL,
bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
const OUString& rFontFileURL, const OUString& rFontName )
{
- RTL_LOGFILE_TRACE1( "WinSalGraphics::AddTempDevFont(): %s",
OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO( "vcl.gdi", "WinSalGraphics::AddTempDevFont(): " <<
OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() );
ImplDevFontAttributes aDFA;
aDFA.SetFamilyName(rFontName);
@@ -2703,7 +2703,6 @@ sal_Bool WinSalGraphics::CreateFontSubset( const
OUString& rToFile,
return (nRC == SF_OK);
}
-//--------------------------------------------------------------------------
const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont,
const sal_Unicode* pUnicodes, sal_Int32* pCharWidths,
@@ -2760,14 +2759,12 @@ const void* WinSalGraphics::GetEmbedFontData( const
PhysicalFontFace* pFont,
return (void*)pData;
}
-//--------------------------------------------------------------------------
void WinSalGraphics::FreeEmbedFontData( const void* pData, long /*nLen*/ )
{
delete[] reinterpret_cast<char*>(const_cast<void*>(pData));
}
-//--------------------------------------------------------------------------
const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector( const
PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
{
@@ -2794,7 +2791,6 @@ const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector(
const PhysicalFontFace
return pEncoding;
}
-//--------------------------------------------------------------------------
void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
@@ -2888,12 +2884,10 @@ void WinSalGraphics::GetGlyphWidths( const
PhysicalFontFace* pFont,
}
}
-//--------------------------------------------------------------------------
void WinSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
{}
-//--------------------------------------------------------------------------
SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const
{
@@ -2910,6 +2904,5 @@ SystemFontData WinSalGraphics::GetSysFontData( int
nFallbacklevel ) const
return aSysFontData;
}
-//--------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
