summaryrefslogtreecommitdiff
path: root/canvas/source/cairo
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/source/cairo')
-rw-r--r--canvas/source/cairo/cairo_canvas.cxx6
-rw-r--r--canvas/source/cairo/cairo_canvascustomsprite.cxx2
-rw-r--r--canvas/source/cairo/cairo_devicehelper.cxx2
-rw-r--r--canvas/source/cairo/cairo_services.cxx2
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.cxx4
-rw-r--r--canvas/source/cairo/cairo_spritecanvashelper.cxx2
-rw-r--r--canvas/source/cairo/cairo_spritedevicehelper.cxx6
-rw-r--r--canvas/source/cairo/cairo_spritehelper.cxx2
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx22
9 files changed, 15 insertions, 33 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index e27daa2384eb..c8bdca809046 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
@@ -66,7 +64,7 @@ namespace cairocanvas
4: XWindow for creating Window (or empty for VirtualDevice)
5: SystemGraphicsData as a streamed Any
*/
- VERBOSE_TRACE("Canvas created %p\n", this);
+ SAL_INFO("canvas.cairo","Canvas created " << this);
ENSURE_ARG_OR_THROW( maArguments.getLength() >= 6 &&
maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER &&
@@ -108,7 +106,7 @@ namespace cairocanvas
Canvas::~Canvas()
{
- OSL_TRACE( "CairoCanvas destroyed" );
+ SAL_INFO("canvas.cairo", "CairoCanvas destroyed" );
}
void Canvas::disposeThis()
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index 1cb6d771bd51..b3d97165234d 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index a59f257d8208..a0939952d69b 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <osl/mutex.hxx>
diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index 39a1afd1fcb9..55bc4d5d8028 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 87379a8b37b8..5f32a27f0dcc 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
@@ -52,7 +50,7 @@ namespace cairocanvas
void SpriteCanvas::initialize()
{
- VERBOSE_TRACE("CairoSpriteCanvas created %p\n", this);
+ SAL_INFO("canvas.cairo", "CairoSpriteCanvas created " << this);
// #i64742# Only call initialize when not in probe mode
if( maArguments.getLength() == 0 )
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index a07fc1e23b3b..6fd8ef9d899f 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 6c964418623e..e9bd2f926e09 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx>
#include <osl/mutex.hxx>
@@ -72,13 +70,13 @@ namespace cairocanvas
bool SpriteDeviceHelper::showBuffer( bool, bool )
{
- OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
+ SAL_WARN("canvas.cairo", "showBuffer Not supposed to be called, handled by SpriteCanvas");
return false;
}
bool SpriteDeviceHelper::switchBuffer( bool, bool )
{
- OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
+ SAL_WARN("canvas.cairo", "showBuffer Not supposed to be called, handled by SpriteCanvas");
return false;
}
diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx
index bb06b55a1974..ee7605634e60 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/math.hxx>
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index f2f552ade9d2..2510729c704b 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -19,8 +19,6 @@
#include <math.h>
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
@@ -146,7 +144,7 @@ namespace cairocanvas
if( aAdvancements.getLength() != maText.Length )
{
- OSL_TRACE( "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" );
+ SAL_WARN("canvas.cairo", "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" );
throw lang::IllegalArgumentException();
}
@@ -300,7 +298,7 @@ namespace cairocanvas
// vertical glyph rendering is not supported in cairo for now
if (aSysFontData.bVerticalCharacterType)
{
- OSL_TRACE(":cairocanvas::TextLayout::isCairoRenderable(): ***************** VERTICAL CHARACTER STYLE!!! ****************");
+ SAL_WARN("canvas.cairo", ":cairocanvas::TextLayout::isCairoRenderable(): Vertical Character Style not supported");
return false;
}
@@ -364,13 +362,13 @@ namespace cairocanvas
if( !isCairoRenderable(aFontData.back().first) )
{
bCairoRenderable = false;
- OSL_TRACE(":cairocanvas::TextLayout::draw(S,O,p,v,r): VCL FALLBACK %s%s%s%s - %s",
- maLogicalAdvancements.getLength() ? "ADV " : "",
- aFontData.back().first.bAntialias ? "AA " : "",
- aFontData.back().first.bFakeBold ? "FB " : "",
- aFontData.back().first.bFakeItalic ? "FI " : "",
- OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
- RTL_TEXTENCODING_UTF8 ).getStr());
+ SAL_INFO("canvas.cairo", ":cairocanvas::TextLayout::draw(S,O,p,v,r): VCL FALLBACK " <<
+ (maLogicalAdvancements.getLength() ? "ADV " : "") <<
+ (aFontData.back().first.bAntialias ? "AA " : "") <<
+ (aFontData.back().first.bFakeBold ? "FB " : "") <<
+ (aFontData.back().first.bFakeItalic ? "FI " : "") <<
+ " - " <<
+ maText.Text.copy( maText.StartPosition, maText.Length));
break;
}
}
@@ -519,7 +517,7 @@ namespace cairocanvas
}
cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
}
- OSL_TRACE(":cairocanvas::TextLayout::draw(S,O,p,v,r): FAKEBOLD - dx:%d", (int) bold_dx);
+ SAL_INFO("canvas.cairo",":cairocanvas::TextLayout::draw(S,O,p,v,r): FAKEBOLD - dx:" << (int) bold_dx);
}
cairo_font_face_destroy(font_face);
generated by cgit (git 2.34.1) at 2024-07-14 20:13:42 +0000