Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3917
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/3917/1
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*
Change-Id: I0054bc90fdcaa2fef7e1d98a0528277be4fc341e
---
M canvas/source/directx/dx_bitmapcanvashelper.cxx
M canvas/source/vcl/canvasbitmaphelper.cxx
M canvas/source/vcl/impltools.cxx
M comphelper/source/container/embeddedobjectcontainer.cxx
M cppcanvas/source/mtfrenderer/bitmapaction.cxx
M cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
M cppcanvas/source/mtfrenderer/implrenderer.cxx
M cppcanvas/source/mtfrenderer/lineaction.cxx
M cppcanvas/source/mtfrenderer/pointaction.cxx
M cppcanvas/source/mtfrenderer/polypolyaction.cxx
M cppcanvas/source/mtfrenderer/textaction.cxx
M cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
12 files changed, 108 insertions(+), 127 deletions(-)
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx
b/canvas/source/directx/dx_bitmapcanvashelper.cxx
index 9772cc2..e9577e1 100644
--- a/canvas/source/directx/dx_bitmapcanvashelper.cxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx
@@ -21,7 +21,6 @@
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <com/sun/star/rendering/TexturingMode.hpp>
@@ -159,7 +158,7 @@
uno::Sequence< sal_Int8 > BitmapCanvasHelper::getData( rendering::IntegerBitmapLayout&
bitmapLayout,
const geometry::IntegerRectangle2D&
rect )
{
- RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::getData()" );
+ SAL_INFO( "canvas.directx", "::dxcanvas::BitmapCanvasHelper::getData()" );
ENSURE_OR_THROW( mpTarget,
"::dxcanvas::BitmapCanvasHelper::getData(): disposed" );
@@ -175,7 +174,7 @@
const rendering::IntegerBitmapLayout& bitmapLayout,
const geometry::IntegerRectangle2D& rect )
{
- RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::setData()" );
+ SAL_INFO( "canvas.directx", "::dxcanvas::BitmapCanvasHelper::setData()" );
ENSURE_OR_THROW( mpTarget,
"::dxcanvas::BitmapCanvasHelper::setData(): disposed" );
@@ -190,7 +189,7 @@
const rendering::IntegerBitmapLayout& bitmapLayout,
const geometry::IntegerPoint2D& pos )
{
- RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::setPixel()" );
+ SAL_INFO( "canvas.directx", "::dxcanvas::BitmapCanvasHelper::setPixel()" );
ENSURE_OR_THROW( mpTarget,
"::dxcanvas::BitmapCanvasHelper::setPixel(): disposed" );
@@ -204,7 +203,7 @@
uno::Sequence< sal_Int8 > BitmapCanvasHelper::getPixel( rendering::IntegerBitmapLayout&
bitmapLayout,
const geometry::IntegerPoint2D& pos )
{
- RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::getPixel()" );
+ SAL_INFO( "canvas.directx", "::dxcanvas::BitmapCanvasHelper::getPixel()" );
ENSURE_OR_THROW( mpTarget,
"::dxcanvas::BitmapCanvasHelper::getPixel(): disposed" );
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx
index 6a9698a..9178ff7 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/util/Endianness.hpp>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <tools/poly.hxx>
@@ -112,7 +111,7 @@
ENSURE_OR_THROW( mpDevice,
"disposed CanvasHelper" );
- RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::getScaledBitmap()" );
+ SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::getScaledBitmap()" );
if( !mpBackBuffer || mpDevice )
return uno::Reference< rendering::XBitmap >(); // we're disposed
@@ -129,7 +128,7 @@
uno::Sequence< sal_Int8 > CanvasBitmapHelper::getData( rendering::IntegerBitmapLayout&
rLayout,
const geometry::IntegerRectangle2D&
rect )
{
- RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::getData()" );
+ SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::getData()" );
if( !mpBackBuffer )
return uno::Sequence< sal_Int8 >(); // we're disposed
@@ -195,7 +194,7 @@
const rendering::IntegerBitmapLayout& rLayout,
const geometry::IntegerRectangle2D& rect )
{
- RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::setData()" );
+ SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::setData()" );
if( !mpBackBuffer )
return; // we're disposed
@@ -427,7 +426,7 @@
const rendering::IntegerBitmapLayout& rLayout,
const geometry::IntegerPoint2D& pos )
{
- RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::setPixel()" );
+ SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::setPixel()" );
if( !mpBackBuffer )
return; // we're disposed
@@ -491,7 +490,7 @@
uno::Sequence< sal_Int8 > CanvasBitmapHelper::getPixel( rendering::IntegerBitmapLayout&
rLayout,
const geometry::IntegerPoint2D& pos )
{
- RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::getPixel()" );
+ SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::getPixel()" );
if( !mpBackBuffer )
return uno::Sequence< sal_Int8 >(); // we're disposed
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 797fca9..0dce580 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -22,7 +22,6 @@
#include <tools/diagnose_ex.h>
#include <rtl/math.hxx>
-#include <rtl/logfile.hxx>
#include <com/sun/star/geometry/RealSize2D.hpp>
#include <com/sun/star/geometry/RealPoint2D.hpp>
@@ -207,8 +206,8 @@
const uno::Sequence< double >& rDeviceColor,
ModulationMode eModulationMode )
{
- RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::tools::transformBitmap()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::vclcanvas::tools::transformBitmap: 0x%X",
&rBitmap );
+ SAL_INFO( "canvas.vcl", "::vclcanvas::tools::transformBitmap()" );
+ SAL_INFO( "canvas.vcl", "::vclcanvas::tools::transformBitmap: 0x" << std::hex <<
&rBitmap );
// calc transformation and size of bitmap to be
// generated. Note, that the translational components are
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 99bccd0..fb90a0b 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -44,7 +44,6 @@
#include <boost/unordered_map.hpp>
#include <algorithm>
-#include <rtl/logfile.hxx>
using namespace ::com::sun::star;
@@ -193,7 +192,7 @@
}
catch (const uno::Exception&)
{
- OSL_FAIL( "Problems releasing image substorage!\n" );
+ SAL_WARN( "comphelper.container", "Problems releasing image substorage!\n" );
}
}
}
@@ -307,15 +306,15 @@
++aIt;
}
- OSL_FAIL( "Unknown object!" );
+ SAL_WARN( "comphelper.container", "Unknown object!" );
return OUString();
}
uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedObject( const
OUString& rName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::GetEmbeddedObject" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::GetEmbeddedObject" );
- OSL_ENSURE( !rName.isEmpty(), "Empty object name!");
+ SAL_WARN_IF( rName.isEmpty(), "comphelper.container", "Empty object name!");
uno::Reference < embed::XEmbeddedObject > xObj;
EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.find( rName );
@@ -382,8 +381,7 @@
}
catch (uno::Exception const& e)
{
- SAL_WARN("comphelper", "EmbeddedObjectContainer::Get_Impl: "
- "exception caught: " << e.Message);
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::Get_Impl: exception caught: "
<< e.Message);
}
return xObj;
@@ -392,12 +390,12 @@
uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const
uno::Sequence < sal_Int8 >& rClassId,
const uno::Sequence < beans::PropertyValue >& rArgs, OUString& rNewName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::CreateEmbeddedObject" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::CreateEmbeddedObject" );
if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
- OSL_ENSURE( !HasEmbeddedObject(rNewName), "Object to create already exists!");
+ SAL_WARN_IF( HasEmbeddedObject(rNewName), "comphelper.container", "Object to create already
exists!");
// create object from classid by inserting it into storage
uno::Reference < embed::XEmbeddedObject > xObj;
@@ -420,8 +418,7 @@
}
catch (uno::Exception const& e)
{
- SAL_WARN("comphelper", "EmbeddedObjectContainer::CreateEmbeddedObject: "
- "exception caught: " << e.Message);
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::CreateEmbeddedObject: exception
caught: " << e.Message);
}
return xObj;
@@ -434,10 +431,10 @@
void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference <
::com::sun::star::embed::XEmbeddedObject >& xObj, const OUString& rName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::AddEmbeddedObject" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::AddEmbeddedObject" );
#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( !rName.isEmpty(), "Added object doesn't have a name!");
+ SAL_WARN_IF( rName.isEmpty(), "comphelper.container", "Added object doesn't have a name!");
uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, uno::UNO_QUERY );
uno::Reference < embed::XEmbedPersist > xEmb( xObj, uno::UNO_QUERY );
uno::Reference < embed::XLinkageSupport > xLink( xEmb, uno::UNO_QUERY );
@@ -498,7 +495,7 @@
sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference <
embed::XEmbeddedObject >& xObj, OUString& rName, sal_Bool bCopy )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::StoreEmbeddedObject" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::StoreEmbeddedObject" );
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
if ( rName.isEmpty() )
@@ -529,8 +526,7 @@
}
catch (uno::Exception const& e)
{
- SAL_WARN("comphelper", "EmbeddedObjectContainer::StoreEmbeddedObject: "
- "exception caught: " << e.Message);
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::StoreEmbeddedObject: exception
caught: " << e.Message);
// TODO/LATER: better error recovery should keep storage intact
return sal_False;
}
@@ -540,7 +536,7 @@
sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference <
embed::XEmbeddedObject >& xObj, OUString& rName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( Object )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( Object )" );
// store it into the container storage
if ( StoreEmbeddedObject( xObj, rName, sal_False ) )
{
@@ -554,7 +550,7 @@
uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const
uno::Reference < io::XInputStream >& xStm, OUString& rNewName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( InputStream )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( InputStream )" );
if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
@@ -594,9 +590,7 @@
catch (uno::Exception const& e)
{
// complete disaster!
- SAL_WARN("comphelper",
- "EmbeddedObjectContainer::InsertEmbeddedObject: "
- "exception caught: " << e.Message);
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::InsertEmbeddedObject:
exception caught: " << e.Message);
return uno::Reference < embed::XEmbeddedObject >();
}
}
@@ -618,7 +612,7 @@
uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString&
rNewName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( MediaDescriptor )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( MediaDescriptor )" );
if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
@@ -652,7 +646,7 @@
uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString&
rNewName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedLink" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedLink" );
if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
@@ -691,7 +685,7 @@
const OUString& aOrigName,
const OUString& aTargetName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::TryToCopyGraphReplacement" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::TryToCopyGraphReplacement" );
sal_Bool bResult = sal_False;
@@ -708,7 +702,7 @@
uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject(
EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString&
rName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::CopyAndGetEmbeddedObject" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::CopyAndGetEmbeddedObject" );
uno::Reference< embed::XEmbeddedObject > xResult;
@@ -811,7 +805,7 @@
{
// impossibility to copy readonly property is not treated as an error
for now
// but the assertion is helpful to detect such scenarios and review
them
- OSL_FAIL( "Could not copy readonly property!\n" );
+ SAL_WARN( "comphelper.container", "Could not copy readonly
property!\n" );
}
}
}
@@ -836,7 +830,7 @@
}
}
- OSL_ENSURE( xResult.is(), "Can not copy embedded object that has no persistance!\n" );
+ SAL_WARN_IF( !xResult.is(), "comphelper.container", "Can not copy embedded object that has no
persistance!\n" );
if ( xResult.is() )
{
@@ -861,7 +855,7 @@
sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const
uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Object )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Object )" );
// get the object name before(!) it is assigned to a new storage
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
@@ -880,7 +874,7 @@
}
catch (const uno::Exception&)
{
- OSL_FAIL( "Failed to insert embedded object into storage!" );
+ SAL_WARN( "comphelper.container", "Failed to insert embedded object into storage!" );
bRet = sal_False;
}
@@ -901,7 +895,7 @@
++aIt;
}
- OSL_ENSURE( bRet, "Object not found for removal!" );
+ SAL_WARN_IF( !bRet, "comphelper.container", "Object not found for removal!" );
if ( xPersist.is() )
{
// now it's time to remove the storage from the container storage
@@ -912,7 +906,7 @@
}
catch (const uno::Exception&)
{
- OSL_FAIL( "Failed to remove object from storage!" );
+ SAL_WARN( "comphelper.container", "Failed to remove object from storage!" );
bRet = sal_False;
}
}
@@ -926,7 +920,7 @@
// #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary
storage+
sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose,
sal_Bool bKeepToTempStorage )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Name )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Name )" );
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( rName );
if ( xObj.is() )
@@ -938,7 +932,7 @@
sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName,
EmbeddedObjectContainer& rCnt )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Name )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Name )" );
// find object entry
EmbeddedObjectContainerNameMap::iterator aIt2 = rCnt.pImpl->maObjectContainer.find( rName );
@@ -979,13 +973,13 @@
}
catch (const uno::Exception&)
{
- OSL_FAIL("Could not move object!");
+ SAL_WARN( "comphelper.container", "Could not move object!");
return sal_False;
}
}
else
- OSL_FAIL("Unknown object!");
+ SAL_WARN( "comphelper.container", "Unknown object!");
return sal_False;
}
@@ -993,7 +987,7 @@
// #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary
storage+
sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference <
embed::XEmbeddedObject >& xObj, sal_Bool bClose, sal_Bool bKeepToTempStorage )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Object )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Object )" );
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
OUString aName;
@@ -1058,7 +1052,7 @@
static const OUString s_sMediaType("MediaType");
xStorProps->getPropertyValue( s_sMediaType ) >>= aOrigStorMediaType;
- OSL_ENSURE( !aOrigStorMediaType.isEmpty(), "No valuable media type in the
storage!\n" );
+ SAL_WARN_IF( aOrigStorMediaType.isEmpty(), "comphelper.container", "No
valuable media type in the storage!\n" );
uno::Reference< beans::XPropertySet > xTargetStorProps(
pImpl->mpTempObjectContainer->pImpl->mxStorage,
@@ -1067,7 +1061,7 @@
}
catch (const uno::Exception&)
{
- OSL_FAIL( "Can not set the new media type to a storage!\n" );
+ SAL_WARN( "comphelper.container", "Can not set the new media type to a
storage!\n" );
}
}
@@ -1108,7 +1102,7 @@
++aIt;
}
- OSL_ENSURE( bFound, "Object not found for removal!" );
+ SAL_WARN_IF( !bFound,"comphelper.container", "Object not found for removal!" );
(void)bFound;
if ( xPersist.is() && bKeepToTempStorage ) // #i119941#
{
@@ -1127,7 +1121,7 @@
}
catch (const uno::Exception&)
{
- OSL_FAIL( "Failed to remove object from storage!" );
+ SAL_WARN( "comphelper.container", "Failed to remove object from storage!" );
return sal_False;
}
}
@@ -1137,7 +1131,7 @@
sal_Bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference <
embed::XEmbeddedObject >& xObj )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::CloseEmbeddedObject" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::CloseEmbeddedObject" );
// disconnect the object from the container and close it if possible
@@ -1174,11 +1168,11 @@
uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const OUString&
aName, OUString* pMediaType )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::GetGraphicStream( Name )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::GetGraphicStream( Name )" );
uno::Reference < io::XInputStream > xStream;
- OSL_ENSURE( !aName.isEmpty(), "Retrieving graphic for unknown object!" );
+ SAL_WARN_IF( aName.isEmpty(), "comphelper.container", "Retrieving graphic for unknown object!"
);
if ( !aName.isEmpty() )
{
try
@@ -1206,7 +1200,7 @@
uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, OUString*
pMediaType )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::GetGraphicStream( Object )" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::GetGraphicStream( Object )" );
// get the object name
OUString aName;
@@ -1228,7 +1222,7 @@
sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference <
com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString&
rMediaType )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertGraphicStream" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertGraphicStream" );
try
{
@@ -1265,7 +1259,7 @@
sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const
com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString&
rObjectName, const OUString& rMediaType )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertGraphicStreamDirectly" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertGraphicStreamDirectly" );
try
{
@@ -1297,7 +1291,7 @@
sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName )
{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::RemoveGraphicStream" );
+ SAL_INFO( "comphelper.container", "comphelper (mv76033)
comphelper::EmbeddedObjectContainer::RemoveGraphicStream" );
try
{
@@ -1338,7 +1332,7 @@
}
catch (const uno::Exception&)
{
- OSL_FAIL( "The pictures storage is not available!\n" );
+ SAL_WARN( "comphelper.container", "The pictures storage is not available!\n" );
}
}
@@ -1356,7 +1350,7 @@
for(;pIter != pEnd;++pIter)
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
- OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+ SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded
objects list!\n" );
if ( xObj.is() )
{
sal_Bool bSwitchBackToLoaded = sal_False;
@@ -1428,7 +1422,7 @@
}
catch (const embed::WrongStateException&)
{
- SAL_WARN("comphelper", "failed to store '" << *pIter << "'");
+ SAL_WARN("comphelper.container", "failed to store '" << *pIter << "'");
}
}
@@ -1445,7 +1439,7 @@
{
// TODO/LATER: error handling
bResult = sal_False;
- SAL_WARN("comphelper", "failed. Message: " << e.Message);
+ SAL_WARN("comphelper.container", "failed. Message: " << e.Message);
}
// the old SO6 format does not store graphical replacements
@@ -1476,7 +1470,7 @@
for(;pIter != pEnd;++pIter)
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
- OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+ SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects
list!\n" );
if ( xObj.is() )
{
sal_Int32 nCurState = xObj->getCurrentState();
@@ -1623,7 +1617,7 @@
for(;pIter != pEnd;++pIter)
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
- OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+ SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects
list!\n" );
if ( xObj.is() )
{
uno::Reference< embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 87dcbab..9c2b8da 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -144,8 +144,8 @@
bool BitmapAction::renderPrimitive( uno::Reference< rendering::XCachedPrimitive >&
rCachedPrimitive,
const ::basegfx::B2DHomMatrix&
rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::BitmapAction::renderPrimitive()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::BitmapAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::BitmapAction::renderPrimitive()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::BitmapAction: 0x" << std::hex
<< this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
index 4c7750c..02de858 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
@@ -18,7 +18,6 @@
*/
-#include <rtl/logfile.hxx>
#include <com/sun/star/rendering/RepaintResult.hpp>
@@ -47,8 +46,8 @@
bool CachedPrimitiveBase::render( const ::basegfx::B2DHomMatrix& rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::CachedPrimitiveBase::render()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::CachedPrimitiveBase: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::CachedPrimitiveBase::render()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::CachedPrimitiveBase: 0x" <<
std::hex << this );
const rendering::ViewState& rViewState( mpCanvas->getViewState() );
::basegfx::B2DHomMatrix aTotalTransform;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 5bc99a5..43094a3 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -22,7 +22,6 @@
#include <canvas/verbosetrace.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
@@ -2673,7 +2672,7 @@
break;
default:
- OSL_FAIL( "Unknown meta action type encountered" );
+ SAL_WARN( "cppcanvas.emf", "Unknown meta action type encountered" );
break;
}
@@ -2919,7 +2918,7 @@
CanvasGraphicHelper( rCanvas ),
maActions()
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::ImplRenderer(mtf)" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::ImplRenderer::ImplRenderer(mtf)" );
OSL_ENSURE( rCanvas.get() != NULL && rCanvas->getUNOCanvas().is(),
"ImplRenderer::ImplRenderer(): Invalid canvas" );
@@ -3046,7 +3045,7 @@
bool ImplRenderer::drawSubset( sal_Int32 nStartIndex,
sal_Int32 nEndIndex ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::drawSubset()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::ImplRenderer::drawSubset()" );
ActionVector::const_iterator aRangeBegin;
ActionVector::const_iterator aRangeEnd;
@@ -3083,7 +3082,7 @@
}
catch( uno::Exception& )
{
- OSL_FAIL( OUStringToOString(
+ SAL_WARN("cppcanvas.emf", "" << OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -3095,7 +3094,7 @@
::basegfx::B2DRange ImplRenderer::getSubsetArea( sal_Int32 nStartIndex,
sal_Int32 nEndIndex ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::getSubsetArea()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::ImplRenderer::getSubsetArea()" );
ActionVector::const_iterator aRangeBegin;
ActionVector::const_iterator aRangeEnd;
@@ -3132,7 +3131,7 @@
bool ImplRenderer::draw() const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::draw()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::ImplRenderer::draw()" );
::basegfx::B2DHomMatrix aMatrix;
::canvas::tools::getRenderStateTransform( aMatrix,
@@ -3144,7 +3143,7 @@
}
catch( uno::Exception& )
{
- OSL_FAIL( OUStringToOString(
+ SAL_WARN( "cppcanvas.emf", "" << OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx
b/cppcanvas/source/mtfrenderer/lineaction.cxx
index ecc16b3..6553f34 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -21,7 +21,6 @@
#include <lineaction.hxx>
#include <outdevstate.hxx>
-#include <rtl/logfile.hxx>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <tools/gen.hxx>
@@ -87,8 +86,8 @@
bool LineAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::LineAction::render()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::LineAction: 0x%X", this
);
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::LineAction::render()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::LineAction: 0x" << std::hex <<
this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx
b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 43bd43e..3349e57 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -18,7 +18,6 @@
*/
-#include <rtl/logfile.hxx>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <sal/types.h>
@@ -103,8 +102,8 @@
bool PointAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::PointAction::render()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::PointAction: 0x%X", this
);
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::PointAction::render()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::PointAction: 0x" << std::hex <<
this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 92d7063..af08d65 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -18,8 +18,6 @@
*/
-#include <rtl/logfile.hxx>
-
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp>
@@ -152,8 +150,8 @@
bool PolyPolyAction::renderPrimitive( uno::Reference< rendering::XCachedPrimitive >&
rCachedPrimitive,
const ::basegfx::B2DHomMatrix&
rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::PolyPolyAction::renderPrimitive()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::PolyPolyAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::PolyPolyAction::renderPrimitive()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::PolyPolyAction: 0x" << std::hex
<< this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
@@ -281,8 +279,8 @@
bool TexturedPolyPolyAction::renderPrimitive( uno::Reference<
rendering::XCachedPrimitive >& rCachedPrimitive,
const ::basegfx::B2DHomMatrix&
rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::PolyPolyAction::renderPrimitive()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::PolyPolyAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::PolyPolyAction::renderPrimitive()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::PolyPolyAction: 0x" << std::hex
<< this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
@@ -394,8 +392,8 @@
bool StrokedPolyPolyAction::renderPrimitive( uno::Reference<
rendering::XCachedPrimitive >& rCachedPrimitive,
const ::basegfx::B2DHomMatrix&
rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::PolyPolyAction::renderPrimitive()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::PolyPolyAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::PolyPolyAction::renderPrimitive()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::PolyPolyAction: 0x" << std::hex
<< this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx
b/cppcanvas/source/mtfrenderer/textaction.cxx
index 3feeaa1..61b9182 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -22,8 +22,6 @@
#include <tools/diagnose_ex.h>
#include <canvas/verbosetrace.hxx>
-#include <rtl/logfile.hxx>
-
#include <com/sun/star/rendering/PathCapType.hpp>
#include <com/sun/star/rendering/PathJoinType.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
@@ -702,8 +700,8 @@
bool TextAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TextAction::render()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TextAction: 0x%X", this
);
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::TextAction::render()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::TextAction: 0x" << std::hex <<
this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
@@ -717,7 +715,7 @@
bool TextAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& /*rSubset*/ ) const
{
- OSL_FAIL( "TextAction::renderSubset(): Subset not supported by this object" );
+ SAL_WARN( "cppcanvas.emf", "TextAction::renderSubset(): Subset not supported by
this object" );
// TODO(P1): Retrieve necessary font metric info for
// TextAction from XCanvas. Currently, the
@@ -748,7 +746,7 @@
::basegfx::B2DRange TextAction::getBounds( const ::basegfx::B2DHomMatrix&
rTransformation,
const Subset&
/*rSubset*/ ) const
{
- OSL_FAIL( "TextAction::getBounds(): Subset not supported by this object" );
+ SAL_WARN( "cppcanvas.emf", "TextAction::getBounds(): Subset not supported by this
object" );
// TODO(P1): Retrieve necessary font metric info for
// TextAction from XCanvas. Currently, the
@@ -934,8 +932,8 @@
bool EffectTextAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::EffectTextAction::render()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::EffectTextAction::render()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::EffectTextAction: 0x" <<
std::hex << this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
@@ -953,7 +951,7 @@
bool EffectTextAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& /*rSubset*/ )
const
{
- OSL_FAIL( "EffectTextAction::renderSubset(): Subset not supported by this object"
);
+ SAL_WARN( "cppcanvas.emf", "EffectTextAction::renderSubset(): Subset not supported
by this object" );
// TODO(P1): Retrieve necessary font metric info for
// TextAction from XCanvas. Currently, the
@@ -989,7 +987,7 @@
::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix&
rTransformation,
const Subset&
/*rSubset*/ ) const
{
- OSL_FAIL( "EffectTextAction::getBounds(): Subset not supported by this object" );
+ SAL_WARN( "cppcanvas.emf", "EffectTextAction::getBounds(): Subset not supported by
this object" );
// TODO(P1): Retrieve necessary font metric info for
// TextAction from XCanvas. Currently, the
@@ -1101,8 +1099,8 @@
bool TextArrayAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TextArrayAction::render()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TextArrayAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::TextArrayAction::render()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::TextArrayAction: 0x" <<
std::hex << this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
@@ -1117,8 +1115,8 @@
bool TextArrayAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::TextArrayAction::renderSubset()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TextArrayAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::TextArrayAction::renderSubset()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::TextArrayAction: 0x" <<
std::hex << this );
rendering::RenderState aLocalState( maState );
uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout );
@@ -1155,8 +1153,8 @@
::basegfx::B2DRange TextArrayAction::getBounds( const ::basegfx::B2DHomMatrix&
rTransformation,
const Subset&
rSubset ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::TextArrayAction::getBounds(
subset )" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TextArrayAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::TextArrayAction::getBounds(
subset )" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::TextArrayAction: 0x" <<
std::hex << this );
rendering::RenderState aLocalState( maState );
uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout );
@@ -1353,8 +1351,8 @@
bool EffectTextArrayAction::render( const ::basegfx::B2DHomMatrix& rTransformation )
const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::EffectTextArrayAction::render()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction:
0x%X", this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::EffectTextArrayAction::render()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::EffectTextArrayAction: 0x" <<
std::hex << this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
@@ -1407,8 +1405,8 @@
bool EffectTextArrayAction::renderSubset( const ::basegfx::B2DHomMatrix&
rTransformation,
const Subset& rSubset )
const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::EffectTextArrayAction::renderSubset()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction:
0x%X", this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::EffectTextArrayAction::renderSubset()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::EffectTextArrayAction: 0x" <<
std::hex << this );
rendering::RenderState aLocalState( maState );
uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout );
@@ -1478,8 +1476,8 @@
::basegfx::B2DRange EffectTextArrayAction::getBounds( const ::basegfx::B2DHomMatrix&
rTransformation,
const Subset&
rSubset ) const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::EffectTextArrayAction::getBounds( subset )" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction:
0x%X", this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::EffectTextArrayAction::getBounds( subset )" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::EffectTextArrayAction: 0x" <<
std::hex << this );
rendering::RenderState aLocalState( maState );
uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout );
@@ -1749,8 +1747,8 @@
bool OutlineAction::render( const ::basegfx::B2DHomMatrix& rTransformation ) const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::EffectTextArrayAction::render()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction:
0x%X", this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::EffectTextArrayAction::render()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::EffectTextArrayAction: 0x" <<
std::hex << this );
rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation);
@@ -1837,8 +1835,8 @@
bool OutlineAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::OutlineAction::renderSubset()"
);
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::OutlineAction: 0x%X",
this );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::OutlineAction::renderSubset()"
);
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::OutlineAction: 0x" << std::hex
<< this );
if( rSubset.mnSubsetBegin == rSubset.mnSubsetEnd )
return true; // empty range, render nothing
@@ -1908,7 +1906,7 @@
::basegfx::B2DRange OutlineAction::getBounds( const ::basegfx::B2DHomMatrix&
rTransformation,
const Subset&
/*rSubset*/ ) const
{
- OSL_FAIL( "OutlineAction::getBounds(): Subset not yet supported by this object" );
+ SAL_WARN( "cppcanvas.emf", "OutlineAction::getBounds(): Subset not yet supported
by this object" );
return getBounds( rTransformation );
}
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index eb814af..8254320 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -23,8 +23,6 @@
#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
-#include <rtl/logfile.hxx>
-
#include <com/sun/star/rendering/XBitmap.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
@@ -186,8 +184,8 @@
bool TransparencyGroupAction::renderSubset( const ::basegfx::B2DHomMatrix&
rTransformation,
const Subset& rSubset
) const
{
- RTL_LOGFILE_CONTEXT( aLog,
"::cppcanvas::internal::TransparencyGroupAction::renderSubset()" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::TransparencyGroupAction:
0x%X", this );
+ SAL_INFO( "cppcanvas.emf",
"::cppcanvas::internal::TransparencyGroupAction::renderSubset()" );
+ SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::TransparencyGroupAction: 0x" <<
std::hex << this );
// determine overall transformation matrix (render, view,
// and passed transformation)
@@ -216,7 +214,7 @@
nRotate,
nShearX ) )
{
- OSL_FAIL( "TransparencyGroupAction::renderSubset(): non-decomposable
transformation" );
+ SAL_WARN( "cppcanvas.emf", "TransparencyGroupAction::renderSubset():
non-decomposable transformation" );
return false;
}
@@ -329,7 +327,7 @@
break;
default:
- OSL_FAIL( "Unknown meta action type encountered" );
+ SAL_WARN( "cppcanvas.emf", "Unknown meta action type
encountered" );
break;
}
}
--
To view, visit https://gerrit.libreoffice.org/3917
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0054bc90fdcaa2fef7e1d98a0528277be4fc341e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ioan Radu <ioan.radu.g@gmail.com>
Context
- [PATCH] fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO · Ioan Radu (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.