diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-09 21:14:53 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-10 17:14:18 +0000 |
commit | 326777b5d91a7e269bb4dfa38a3263769e0b99b3 (patch) | |
tree | e56769523219b8c25143999b39122f7ff87948ca /canvas | |
parent | SimpleWinLayout::mbDisableGlyphs was always true (diff) | |
download | core-326777b5d91a7e269bb4dfa38a3263769e0b99b3.tar.gz core-326777b5d91a7e269bb4dfa38a3263769e0b99b3.zip |
remove VERBOSE use from canva
in preparation to kill --enable-verbose in configure.ac
convert modules that use VERBOSE-YES/NO (uppercase) env variable
to do things differently at compile time
Convert canvas to use SAL_INFO/SAL_WARN mechanism instead of its
home-grown 'verbose logging'.
Change-Id: I2898d2309d421457839e3cd7078166c6da919882
Reviewed-on: https://gerrit.libreoffice.org/17619
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'canvas')
33 files changed, 40 insertions, 108 deletions
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index fdb3927a7fdf..94efa63f2bdc 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -30,12 +30,6 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\ -UNOMINMAX \ )) -ifneq ($(strip $(VERBOSE)$(verbose)),) -$(eval $(call gb_Library_add_defs,gdipluscanvas,\ - -DVERBOSE \ -)) -endif - $(eval $(call gb_Library_use_libraries,gdipluscanvas,\ cppu \ tk \ 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); diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 42c37ac54004..d18d34ad44c7 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -35,8 +35,6 @@ #include <vcl/syschild.hxx> #include <vcl/window.hxx> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <tools/diagnose_ex.h> #include <canvas/elapsedtime.hxx> @@ -1159,7 +1157,7 @@ namespace dxcanvas } default: - OSL_FAIL("DXRenderModule::pushVertex(): unexpected primitive type"); + SAL_WARN("canvas.directx", "DXRenderModule::pushVertex(): unexpected primitive type"); break; } } diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index 727d9093a181..ebf370e90073 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -19,8 +19,6 @@ #include <ctype.h> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <tools/diagnose_ex.h> @@ -82,7 +80,7 @@ namespace dxcanvas if( maArguments.getLength() == 0 ) return; - VERBOSE_TRACE( "Canvas::initialize called" ); + SAL_INFO("canvas.directx", "Canvas::initialize called" ); // At index 1, we expect a HWND handle here, containing a // pointer to a valid window, on which to output @@ -143,7 +141,7 @@ namespace dxcanvas if( maArguments.getLength() == 0 ) return; - VERBOSE_TRACE( "BitmapCanvas::initialize called" ); + SAL_INFO("canvas.directx", "BitmapCanvas::initialize called" ); // At index 1, we expect a HWND handle here, containing a // pointer to a valid window, on which to output diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx index 89e1b9ef4ef5..7dbe80a0d99a 100644 --- a/canvas/source/directx/dx_canvascustomsprite.cxx +++ b/canvas/source/directx/dx_canvascustomsprite.cxx @@ -19,8 +19,6 @@ #include <ctype.h> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx index 1894e2da802e..384d635dfb6d 100644 --- a/canvas/source/directx/dx_devicehelper.cxx +++ b/canvas/source/directx/dx_devicehelper.cxx @@ -21,8 +21,6 @@ #include <ctype.h> #include <vcl/window.hxx> #include <vcl/canvastools.hxx> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <tools/diagnose_ex.h> diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx index 499d9211bd0b..98a9e49f01f9 100644 --- a/canvas/source/directx/dx_impltools.cxx +++ b/canvas/source/directx/dx_impltools.cxx @@ -21,8 +21,6 @@ #include <ctype.h> #include <basegfx/numeric/ftools.hxx> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index 3ec2214bf786..d6a0e78d655c 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -19,8 +19,6 @@ #include <ctype.h> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> @@ -68,7 +66,7 @@ namespace dxcanvas if( maArguments.getLength() == 0 ) return; - VERBOSE_TRACE( "SpriteCanvas::initialize called" ); + SAL_INFO("canvas.directx", "SpriteCanvas::initialize called" ); /* aArguments: 0: ptr to creating instance (Window or VirtualDevice) diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx index 6a06c6a6b225..e596805b2316 100644 --- a/canvas/source/directx/dx_spritecanvashelper.cxx +++ b/canvas/source/directx/dx_spritecanvashelper.cxx @@ -18,8 +18,6 @@ */ -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <tools/diagnose_ex.h> diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx index e9d5bb4546c2..6664f23c6796 100644 --- a/canvas/source/directx/dx_spritedevicehelper.cxx +++ b/canvas/source/directx/dx_spritedevicehelper.cxx @@ -19,8 +19,6 @@ #include <ctype.h> #include <vcl/window.hxx> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <tools/diagnose_ex.h> @@ -164,13 +162,13 @@ namespace dxcanvas sal_Bool SpriteDeviceHelper::showBuffer( bool, sal_Bool ) { - OSL_FAIL("Not supposed to be called, handled by SpriteCanvas"); + SAL_WARN("canvas.directx", "Not supposed to be called, handled by SpriteCanvas"); return sal_False; } sal_Bool SpriteDeviceHelper::switchBuffer( bool, sal_Bool ) { - OSL_FAIL("Not supposed to be called, handled by SpriteCanvas"); + SAL_WARN("canvas.directx", "Not supposed to be called, handled by SpriteCanvas"); return sal_False; } diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx index 6b45d3866cef..67dd44fe0d10 100644 --- a/canvas/source/directx/dx_spritehelper.cxx +++ b/canvas/source/directx/dx_spritehelper.cxx @@ -18,8 +18,6 @@ */ -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <tools/diagnose_ex.h> #include <rtl/math.hxx> @@ -123,9 +121,8 @@ namespace dxcanvas // background buffer. // log output pos in device pixel - VERBOSE_TRACE( "SpriteHelper::redraw(): output pos is (%f, %f)", - rPos.getX(), - rPos.getY() ); + SAL_INFO("canva.directx", "SpriteHelper::redraw(): output pos is (" << + rPos.getX() << "," << rPos.getY() << ")" ); const double fAlpha( getAlpha() ); const ::basegfx::B2DVector& rSize( getSizePixel() ); diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index 016a3309fd60..3ff3e43d6a44 100644 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx @@ -19,8 +19,6 @@ #include <ctype.h> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <cppuhelper/supportsservice.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -93,7 +91,7 @@ namespace dxcanvas if( aAdvancements.getLength() != maText.Length ) { - OSL_TRACE( "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" ); + SAL_WARN("canvas.directx", "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" ); throw lang::IllegalArgumentException(); } diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index 92b1a2d6e553..ace75a27948b 100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx @@ -18,18 +18,16 @@ */ -#include <vcl/canvastools.hxx> +#include <tools/diagnose_ex.h> +#include <vcl/canvastools.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> -#include <tools/diagnose_ex.h> #include "dx_impltools.hxx" -#include <basegfx/numeric/ftools.hxx> -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> +#include <basegfx/numeric/ftools.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index 7d3fe0ca46ca..a1c732790743 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -11,11 +11,7 @@ #include "ogl_canvastools.hxx" #include "ogl_tools.hxx" -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/verifyinput.hxx> -#include <tools/diagnose_ex.h> - #include <canvas/canvastools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -25,6 +21,7 @@ #include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> +#include <tools/diagnose_ex.h> #include <GL/glew.h> using namespace ::com::sun::star; diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 3e56c5c91a05..42c09e125a57 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -9,10 +9,6 @@ #include "ogl_spritecanvas.hxx" -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> -#include <tools/diagnose_ex.h> - #include <osl/mutex.hxx> #include <com/sun/star/uno/XComponentContext.hpp> @@ -25,6 +21,8 @@ #include <cppuhelper/implementationentry.hxx> #include <comphelper/servicedecl.hxx> +#include <tools/diagnose_ex.h> + #include "ogl_canvascustomsprite.hxx" #define SPRITECANVAS_SERVICE_NAME "com.sun.star.rendering.SpriteCanvas.OGL" @@ -48,7 +46,7 @@ namespace oglcanvas if( maArguments.getLength() == 0 ) return; - VERBOSE_TRACE( "SpriteCanvas::initialize called" ); + SAL_INFO("canvas.ogl", "SpriteCanvas::initialize called" ); /* aArguments: 0: ptr to creating instance (Window or VirtualDevice) diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 25c9e9ba794e..7bab39f95a82 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -14,7 +14,6 @@ #include "ogl_canvascustomsprite.hxx" #include "ogl_texturecache.hxx" -#include <canvas/verbosetrace.hxx> #include <basegfx/tools/canvastools.hxx> #include <basegfx/tools/unopolypolygon.hxx> diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index 88e7ebdf37f4..a6b0b24b215b 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -9,13 +9,9 @@ #include "ogl_textlayout.hxx" -#include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> -#include <tools/diagnose_ex.h> - #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> - +#include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 92035174da5f..8198d966ff9e 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -18,10 +18,8 @@ */ -#include <canvas/debug.hxx> -#include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> +#include <tools/diagnose_ex.h> #include <rtl/math.hxx> diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index 5708b972434d..0c00f0fc9b9f 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -18,7 +18,6 @@ */ -#include <canvas/debug.hxx> #include <tools/diagnose_ex.h> #include <canvas/spriteredrawmanager.hxx> diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index b0e4bb4751fc..b36129635171 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -19,7 +19,6 @@ #include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <tools/diagnose_ex.h> @@ -88,7 +87,7 @@ namespace vclcanvas */ SolarMutexGuard aGuard; - VERBOSE_TRACE( "VCLCanvas::initialize called" ); + SAL_INFO("canvas.vcl", "VCLCanvas::initialize called" ); ENSURE_ARG_OR_THROW( maArguments.getLength() >= 6 && maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER, @@ -117,7 +116,7 @@ namespace vclcanvas Canvas::~Canvas() { - OSL_TRACE( "Canvas destroyed" ); + SAL_INFO("canvas.vcl", "VCLCanvas destroyed" ); } void Canvas::disposeThis() diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index 030c603be189..ae360433a855 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -20,7 +20,6 @@ #include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/math.hxx> diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx index c22cf773d1fb..36c1afbddb75 100644 --- a/canvas/source/vcl/services.cxx +++ b/canvas/source/vcl/services.cxx @@ -19,7 +19,6 @@ #include <canvas/debug.hxx> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <com/sun/star/registry/XRegistryKey.hpp> diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 11901bac4497..be38a8e4b5cc 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -20,7 +20,6 @@ #include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <com/sun/star/registry/XRegistryKey.hpp> @@ -79,7 +78,7 @@ namespace vclcanvas boost::ref(maCanvasHelper), _1))); - VERBOSE_TRACE( "VCLSpriteCanvas::initialize called" ); + SAL_INFO("canvas.vcl", "VCLSpriteCanvas::initialize called" ); ENSURE_ARG_OR_THROW( maArguments.getLength() >= 1, "VCLSpriteCanvas::initialize: wrong number of arguments" ); diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index d7a7fee8904b..2a51868b4936 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -20,7 +20,6 @@ #include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <canvas/canvastools.hxx> #include <vcl/canvastools.hxx> diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index e79e012e939b..4ad2ccbfa183 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -20,7 +20,6 @@ #include <canvas/debug.hxx> #include <tools/diagnose_ex.h> -#include <canvas/verbosetrace.hxx> #include <rtl/math.hxx> @@ -97,9 +96,8 @@ namespace vclcanvas } // log output pos in device pixel - VERBOSE_TRACE( "SpriteHelper::redraw(): output pos is (%f, %f)", - rPos.getX(), - rPos.getY() ); + SAL_INFO("canva.vcl", "SpriteHelper::redraw(): output pos is (" << + rPos.getX() << "," << rPos.getY() << ")"); const double fAlpha( getAlpha() ); @@ -332,9 +330,8 @@ namespace vclcanvas 2,'.',NULL,' ') ); rTargetSurface.DrawText( aOutPos+Point(2,2), text ); - SAL_INFO( - "canvas.level2", - "sprite " << this << " has prio " << getPriority()); + SAL_INFO( "canvas.vcl", + "sprite " << this << " has prio " << getPriority()); } } } |