bin/find-can-be-private-symbols.functions.results | 8
bin/find-mergedlib-can-be-private-symbols.functions.results | 82
+++++-----
canvas/inc/base/bitmapcanvasbase.hxx | 2
canvas/inc/base/bufferedgraphicdevicebase.hxx | 4
canvas/inc/base/canvasbase.hxx | 36 ++--
canvas/inc/base/canvascustomspritebase.hxx | 8
canvas/inc/base/graphicdevicebase.hxx | 8
canvas/inc/base/integerbitmapbase.hxx | 16 -
canvas/inc/base/spritecanvasbase.hxx | 10 -
canvas/inc/propertysethelper.hxx | 2
canvas/inc/verifyinput.hxx | 5
canvas/source/cairo/cairo_canvascustomsprite.cxx | 6
canvas/source/cairo/cairo_canvasfont.cxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 4
canvas/source/cairo/cairo_canvashelper_text.cxx | 6
canvas/source/cairo/cairo_devicehelper.cxx | 2
canvas/source/cairo/cairo_spritecanvashelper.cxx | 10 -
canvas/source/cairo/cairo_textlayout.cxx | 14 -
canvas/source/directx/dx_bitmap.cxx | 12 -
canvas/source/directx/dx_bitmapcanvashelper.cxx | 2
canvas/source/directx/dx_canvascustomsprite.cxx | 4
canvas/source/directx/dx_canvasfont.cxx | 2
canvas/source/directx/dx_canvashelper.cxx | 42
++---
canvas/source/directx/dx_canvashelper_texturefill.cxx | 22 +-
canvas/source/directx/dx_devicehelper.cxx | 4
canvas/source/directx/dx_impltools.cxx | 16 -
canvas/source/directx/dx_impltools.hxx | 4
canvas/source/directx/dx_linepolypolygon.cxx | 2
canvas/source/directx/dx_spritecanvashelper.cxx | 2
canvas/source/directx/dx_spritehelper.cxx | 4
canvas/source/directx/dx_surfacebitmap.cxx | 14 -
canvas/source/directx/dx_surfacegraphics.cxx | 2
canvas/source/directx/dx_textlayout_drawhelper.cxx | 14 -
canvas/source/directx/dx_vcltools.cxx | 14 -
canvas/source/directx/dx_vcltools.hxx | 2
canvas/source/opengl/ogl_bitmapcanvashelper.cxx | 2
canvas/source/opengl/ogl_canvascustomsprite.cxx | 12 -
canvas/source/opengl/ogl_canvasfont.cxx | 2
canvas/source/opengl/ogl_canvashelper.cxx | 6
canvas/source/opengl/ogl_spritedevicehelper.cxx | 6
canvas/source/opengl/ogl_spritedevicehelper.hxx | 2
canvas/source/simplecanvas/simplecanvasimpl.cxx | 9 -
canvas/source/tools/canvascustomspritehelper.cxx | 10 -
canvas/source/tools/canvastools.cxx | 11 -
canvas/source/tools/elapsedtime.cxx | 2
canvas/source/tools/verifyinput.cxx | 2
canvas/source/vcl/backbuffer.cxx | 2
canvas/source/vcl/bitmapbackbuffer.cxx | 2
canvas/source/vcl/canvas.hxx | 4
canvas/source/vcl/canvasbitmap.hxx | 2
canvas/source/vcl/canvasbitmaphelper.cxx | 4
canvas/source/vcl/canvascustomsprite.hxx | 2
canvas/source/vcl/canvasfont.cxx | 4
canvas/source/vcl/canvashelper.cxx | 74
++++-----
canvas/source/vcl/canvashelper_texturefill.cxx | 40 ++--
canvas/source/vcl/devicehelper.cxx | 6
canvas/source/vcl/impltools.cxx | 17 +-
canvas/source/vcl/impltools.hxx | 7
canvas/source/vcl/spritecanvas.hxx | 4
canvas/source/vcl/spritecanvashelper.cxx | 14 -
canvas/source/vcl/spritecanvashelper.hxx | 2
canvas/source/vcl/spritedevicehelper.cxx | 2
canvas/source/vcl/spritehelper.cxx | 2
canvas/source/vcl/textlayout.cxx | 20 +-
canvas/workben/canvasdemo.cxx | 4
compilerplugins/clang/store/constantfunction.cxx | 2
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 2
compilerplugins/clang/unusedfields.readonly.results | 4
compilerplugins/clang/unusedfields.untouched.results | 2
compilerplugins/clang/unusedmethods.results | 2
compilerplugins/clang/unusedvariableplus.cxx | 2
cppcanvas/source/mtfrenderer/bitmapaction.cxx | 8
cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 -
cppcanvas/source/mtfrenderer/lineaction.cxx | 4
cppcanvas/source/mtfrenderer/mtftools.cxx | 8
cppcanvas/source/mtfrenderer/pointaction.cxx | 4
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 12 -
cppcanvas/source/mtfrenderer/textaction.cxx | 38 ++--
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 10 -
cppcanvas/source/tools/canvasgraphichelper.cxx | 4
cppcanvas/source/wrapper/implcanvas.cxx | 6
cppcanvas/source/wrapper/implsprite.cxx | 10 -
include/canvas/canvastools.hxx | 5
include/canvas/elapsedtime.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 2
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2
slideshow/source/engine/activities/simplecontinuousactivitybase.hxx | 2
slideshow/source/engine/activitiesqueue.cxx | 2
slideshow/source/engine/animatedsprite.cxx | 4
slideshow/source/engine/attributemap.cxx | 2
slideshow/source/engine/eventqueue.cxx | 2
slideshow/source/engine/opengl/TransitionerImpl.cxx | 2
slideshow/source/engine/pointersymbol.cxx | 4
slideshow/source/engine/rehearsetimingsactivity.cxx | 4
slideshow/source/engine/rehearsetimingsactivity.hxx | 2
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 2
slideshow/source/engine/shapes/viewappletshape.cxx | 4
slideshow/source/engine/shapes/viewbackgroundshape.cxx | 6
slideshow/source/engine/shapes/viewmediashape.cxx | 10 -
slideshow/source/engine/shapes/viewshape.cxx | 10 -
slideshow/source/engine/slidebitmap.cxx | 4
slideshow/source/engine/slideoverlaybutton.cxx | 4
slideshow/source/engine/slideshowimpl.cxx | 8
slideshow/source/engine/slideview.cxx | 10 -
slideshow/source/engine/tools.cxx | 4
slideshow/source/engine/waitsymbol.cxx | 4
slideshow/source/engine/wakeupevent.cxx | 2
slideshow/source/inc/activitiesqueue.hxx | 6
slideshow/source/inc/eventqueue.hxx | 6
slideshow/source/inc/wakeupevent.hxx | 4
111 files changed, 450 insertions(+), 462 deletions(-)
New commits:
commit 37e71212c7325defdaffc1fd77eddf0335a5314e
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 12:48:44 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:18 2025 +0200
vclcanvas::tools -> vclcanvastools
At least some IDEs are confused by our multitude of `tools` namespaces,
and show errors like `namespace "tools" is ambiguous`.
This removes one such namespace. The idea is to drop all but the one
in /tools (that has tools::Long and tools::Rectangle).
Change-Id: I75fc4835ec76dca698be1983dbc0a935b3f765eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189949
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index aa45a56e7ab6..b93bc62b37be 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -30,7 +30,7 @@ namespace vclcanvas
BackBuffer::BackBuffer( const OutputDevice& rRefDevice ) :
maVDev( VclPtr<VirtualDevice>::Create( rRefDevice,
DeviceFormat::WITHOUT_ALPHA ) )
{
- tools::SetDefaultDeviceAntiAliasing( maVDev );
+ vclcanvastools::SetDefaultDeviceAntiAliasing( maVDev );
}
BackBuffer::~BackBuffer()
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx
b/canvas/source/vcl/bitmapbackbuffer.cxx
index af80984bd95f..cc01c8eed12c 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -120,7 +120,7 @@ namespace vclcanvas
mpVDev->SetOutputSizePixel( maBitmap->GetSizePixel() );
- tools::SetDefaultDeviceAntiAliasing( mpVDev );
+ vclcanvastools::SetDefaultDeviceAntiAliasing( mpVDev );
}
void BitmapBackBuffer::updateVDev() const
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 8bcbc1f49894..c4d340dbd5ac 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -53,13 +53,13 @@ namespace vclcanvas
css::lang::XServiceInfo >
GraphicDeviceBase_Base;
typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper<
GraphicDeviceBase_Base >,
DeviceHelper,
- tools::LocalGuard,
+ vclcanvastools::LocalGuard,
::cppu::OWeakObject >
CanvasBase_Base;
typedef ::canvas::IntegerBitmapBase<
canvas::BitmapCanvasBase2<
CanvasBase_Base,
CanvasHelper,
- tools::LocalGuard,
+ vclcanvastools::LocalGuard,
::cppu::OWeakObject> > CanvasBaseT;
/** Product of this component's factory.
diff --git a/canvas/source/vcl/canvasbitmap.hxx
b/canvas/source/vcl/canvasbitmap.hxx
index cec7c6345545..7a792d1aa763 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@ -49,7 +49,7 @@ namespace vclcanvas
canvas::BitmapCanvasBase2<
::canvas::BaseMutexHelper< CanvasBitmapBase_Base >,
CanvasBitmapHelper,
- tools::LocalGuard,
+ vclcanvastools::LocalGuard,
::cppu::OWeakObject> > CanvasBitmap_Base;
class CanvasBitmap : public CanvasBitmap_Base,
diff --git a/canvas/source/vcl/canvascustomsprite.hxx
b/canvas/source/vcl/canvascustomsprite.hxx
index 1a7d3ccfb69e..b4b0cdca268e 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -69,7 +69,7 @@ namespace vclcanvas
typedef ::canvas::CanvasCustomSpriteBase<
CanvasCustomSpriteSpriteBase_Base,
SpriteHelper,
CanvasHelper,
- tools::LocalGuard,
+ vclcanvastools::LocalGuard,
::cppu::OWeakObject >
CanvasCustomSpriteBaseT;
/* Definition of CanvasCustomSprite class */
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 6d5b49a77d8e..f21c137e61bf 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -63,7 +63,7 @@ namespace vclcanvas
maFont->SetLanguage( LanguageTag::convertToLanguageType(
rFontRequest.Locale, false));
// adjust to stretched/shrunk font
- tools::setupFontWidth(rFontMatrix, maFont.get(),
rOutDevProvider->getOutDev());
+ vclcanvastools::setupFontWidth(rFontMatrix, maFont.get(),
rOutDevProvider->getOutDev());
sal_uInt32 nEmphasisMark = 0;
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index 312926d3ba75..8da6a0a4d7f9 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -155,7 +155,7 @@ namespace vclcanvas
return;
OutputDevice& rOutDev( mpOutDevProvider->getOutDev() );
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
rOutDev.EnableMapMode( false );
rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
@@ -193,12 +193,12 @@ namespace vclcanvas
return;
// nope, render
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
setupOutDevState( viewState, renderState, LINE_COLOR );
- const Point aStartPoint( tools::mapRealPoint2D( aStartRealPoint2D,
+ const Point aStartPoint( vclcanvastools::mapRealPoint2D(
aStartRealPoint2D,
viewState, renderState
) );
- const Point aEndPoint( tools::mapRealPoint2D( aEndRealPoint2D,
+ const Point aEndPoint( vclcanvastools::mapRealPoint2D( aEndRealPoint2D,
viewState, renderState )
);
// TODO(F2): alpha
mpOutDevProvider->getOutDev().DrawLine( aStartPoint, aEndPoint );
@@ -216,19 +216,19 @@ namespace vclcanvas
if( !mpOutDevProvider )
return;
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
setupOutDevState( viewState, renderState, LINE_COLOR );
- const Point aStartPoint( tools::mapRealPoint2D(
geometry::RealPoint2D(aBezierSegment.Px,
+ const Point aStartPoint( vclcanvastools::mapRealPoint2D(
geometry::RealPoint2D(aBezierSegment.Px,
aBezierSegment.Py),
viewState, renderState
) );
- const Point aCtrlPoint1( tools::mapRealPoint2D(
geometry::RealPoint2D(aBezierSegment.C1x,
+ const Point aCtrlPoint1( vclcanvastools::mapRealPoint2D(
geometry::RealPoint2D(aBezierSegment.C1x,
aBezierSegment.C1y),
viewState, renderState
) );
- const Point aCtrlPoint2( tools::mapRealPoint2D(
geometry::RealPoint2D(aBezierSegment.C2x,
+ const Point aCtrlPoint2( vclcanvastools::mapRealPoint2D(
geometry::RealPoint2D(aBezierSegment.C2x,
aBezierSegment.C2y),
viewState,
renderState ) );
- const Point aEndPoint( tools::mapRealPoint2D( _aEndPoint,
+ const Point aEndPoint( vclcanvastools::mapRealPoint2D( _aEndPoint,
viewState, renderState
) );
::tools::Polygon aPoly(4);
@@ -257,12 +257,12 @@ namespace vclcanvas
if( mpOutDevProvider )
{
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
setupOutDevState( viewState, renderState, LINE_COLOR );
const ::basegfx::B2DPolyPolygon aBasegfxPolyPoly(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon) );
- const ::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon(
aBasegfxPolyPoly, viewState, renderState ) );
+ const ::tools::PolyPolygon aPolyPoly(
vclcanvastools::mapPolyPolygon( aBasegfxPolyPoly, viewState, renderState ) );
if( aBasegfxPolyPoly.isClosed() )
{
@@ -307,7 +307,7 @@ namespace vclcanvas
if( mpOutDevProvider )
{
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
::basegfx::B2DHomMatrix aMatrix;
::canvastools::mergeViewAndRenderTransform(aMatrix, viewState,
renderState);
@@ -456,13 +456,13 @@ namespace vclcanvas
if( mpOutDevProvider )
{
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
const int nAlpha( setupOutDevState( viewState, renderState,
FILL_COLOR ) );
::basegfx::B2DPolyPolygon aB2DPolyPoly(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon));
aB2DPolyPoly.setClosed(true); // ensure closed poly, otherwise VCL
does not fill
- const ::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon(
+ const ::tools::PolyPolygon aPolyPoly(
vclcanvastools::mapPolyPolygon(
aB2DPolyPoly,
viewState, renderState ) );
const bool bSourceAlpha( renderState.CompositeOperation ==
rendering::CompositeOperation::SOURCE );
@@ -540,7 +540,7 @@ namespace vclcanvas
if( mpOutDevProvider )
{
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
::Point aOutpos;
if( !setupTextOutput( aOutpos, viewState, renderState, xFont ) )
@@ -599,7 +599,7 @@ namespace vclcanvas
{
if( mpOutDevProvider )
{
- tools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
// TODO(T3): Race condition. We're taking the font
// from xLayoutedText, and then calling draw() at it,
@@ -644,7 +644,7 @@ namespace vclcanvas
if( mpOutDevProvider )
{
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
setupOutDevState( viewState, renderState, IGNORE_COLOR );
::basegfx::B2DHomMatrix aMatrix;
@@ -653,7 +653,7 @@ namespace vclcanvas
::basegfx::B2DPoint aOutputPos( 0.0, 0.0 );
aOutputPos *= aMatrix;
- ::Bitmap aBmp( tools::bitmapFromXBitmap(xBitmap) );
+ ::Bitmap aBmp( vclcanvastools::bitmapFromXBitmap(xBitmap) );
// TODO(F2): Implement modulation again for other color
// channels (currently, works only for alpha). Note: this
@@ -807,7 +807,7 @@ namespace vclcanvas
// complex transformation, use generic affine bitmap
// transformation
- aBmp = tools::transformBitmap( aBmp, aMatrix );
+ aBmp = vclcanvastools::transformBitmap( aBmp, aMatrix );
pGrfObj = std::make_shared<GraphicObject>( aBmp );
@@ -913,7 +913,7 @@ namespace vclcanvas
OutputDevice& rOutDev( mpOutDevProvider->getOutDev() );
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
rOutDev.EnableMapMode( false );
rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
@@ -943,7 +943,7 @@ namespace vclcanvas
OutputDevice& rOutDev( mpOutDevProvider->getOutDev() );
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
rOutDev.EnableMapMode( false );
rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
@@ -993,7 +993,7 @@ namespace vclcanvas
OutputDevice& rOutDev( mpOutDevProvider->getOutDev() );
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
rOutDev.EnableMapMode( false );
rOutDev.SetAntialiasing( AntialiasingFlags::Enable );
@@ -1138,7 +1138,7 @@ namespace vclcanvas
aVCLFont.SetFillColor( aColor );
// no need to replicate this for mp2ndOutDev, we're modifying only
aVCLFont here.
- if( !tools::setupFontTransform( o_rOutPos, aVCLFont, viewState,
renderState, rOutDev ) )
+ if( !vclcanvastools::setupFontTransform( o_rOutPos, aVCLFont,
viewState, renderState, rOutDev ) )
return false;
rOutDev.SetFont( aVCLFont );
@@ -1163,7 +1163,7 @@ namespace vclcanvas
return false; // disposed
else
{
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
setupOutDevState( viewState, renderState, IGNORE_COLOR );
if (!rGrf->Draw(mpOutDevProvider->getOutDev(), rPt, rSz, &rAttr))
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 8765b5aeff13..44eaabc2e666 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -512,7 +512,7 @@ namespace vclcanvas
const ::tools::Rectangle aPolygonDeviceRectOrig(
rPoly.GetBoundRect() );
- if( tools::isRectangle( rPoly ) )
+ if( vclcanvastools::isRectangle( rPoly ) )
{
// use optimized output path
@@ -609,10 +609,10 @@ namespace vclcanvas
if( mpOutDevProvider )
{
- tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
+ vclcanvastools::OutDevStateKeeper aStateKeeper(
mpProtectedOutDevProvider );
const int nTransparency( setupOutDevState( viewState, renderState,
IGNORE_COLOR ) );
- ::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon(
+ ::tools::PolyPolygon aPolyPoly( vclcanvastools::mapPolyPolygon(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon),
viewState, renderState ) );
@@ -685,7 +685,7 @@ namespace vclcanvas
// drawBitmap() in disguise
// =========================================
- const bool bRectangularPolygon( tools::isRectangle( aPolyPoly
) );
+ const bool bRectangularPolygon( vclcanvastools::isRectangle(
aPolyPoly ) );
::basegfx::B2DHomMatrix aTotalTransform;
::canvastools::mergeViewAndRenderTransform(aTotalTransform,
@@ -748,7 +748,7 @@ namespace vclcanvas
// texturing parameters
// ===========================================
- ::Bitmap aBmp( tools::bitmapFromXBitmap(
textures[0].Bitmap ) );
+ ::Bitmap aBmp( vclcanvastools::bitmapFromXBitmap(
textures[0].Bitmap ) );
// scale down bitmap to [0,1]x[0,1] rect, as required
// from the XCanvas interface.
@@ -816,7 +816,7 @@ namespace vclcanvas
// complex transformation, use generic affine bitmap
// transformation
- aBmp = tools::transformBitmap( aBmp, aTotalTransform);
+ aBmp = vclcanvastools::transformBitmap( aBmp,
aTotalTransform);
pGrfObj = std::make_shared<GraphicObject>( aBmp );
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index df43a00577af..5e5b0be4836e 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -44,8 +44,9 @@
using namespace ::com::sun::star;
-namespace vclcanvas::tools
+namespace vclcanvastools
{
+using namespace vclcanvas;
::Bitmap bitmapFromXBitmap( const uno::Reference< rendering::XBitmap
>& xBitmap )
{
// TODO(F3): CanvasCustomSprite should also be tunnelled
@@ -214,8 +215,8 @@ namespace vclcanvas::tools
::Bitmap transformBitmap( const ::Bitmap& rBitmap,
const ::basegfx::B2DHomMatrix& rTransform )
{
- SAL_INFO( "canvas.vcl", "::vclcanvas::tools::transformBitmap()" );
- SAL_INFO( "canvas.vcl", "::vclcanvas::tools::transformBitmap: 0x"
<< std::hex << &rBitmap );
+ SAL_INFO( "canvas.vcl", "::vclcanvastools::transformBitmap()" );
+ SAL_INFO( "canvas.vcl", "::vclcanvastools::transformBitmap: 0x" <<
std::hex << &rBitmap );
// calc transformation and size of bitmap to be
// generated. Note, that the translational components are
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 26b5a8cbf05e..6368778a2d73 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -47,10 +47,8 @@ namespace com::sun::star::rendering
}
-namespace vclcanvas
+namespace vclcanvastools
{
- namespace tools
- {
::Bitmap
bitmapFromXBitmap( const css::uno::Reference<
css::rendering::XBitmap >& );
@@ -106,7 +104,7 @@ namespace vclcanvas
init();
}
- explicit OutDevStateKeeper( const OutDevProviderSharedPtr& rOutDev
) :
+ explicit OutDevStateKeeper( const
vclcanvas::OutDevProviderSharedPtr& rOutDev ) :
mpOutDev( rOutDev ? &(rOutDev->getOutDev()) : nullptr ),
mbMappingWasEnabled( mpOutDev && mpOutDev->IsMapModeEnabled()
),
mnAntiAliasing( mpOutDev ? mpOutDev->GetAntialiasing() :
AntialiasingFlags::NONE )
@@ -153,7 +151,6 @@ namespace vclcanvas
const ::basegfx::B2DHomMatrix&
rTransform );
void SetDefaultDeviceAntiAliasing( OutputDevice* pDevice );
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/spritecanvas.hxx
b/canvas/source/vcl/spritecanvas.hxx
index 8f7c76880f51..a5942c569a9d 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -60,7 +60,7 @@ namespace vclcanvas
css::lang::XServiceInfo >
WindowGraphicDeviceBase_Base;
typedef ::canvas::BufferedGraphicDeviceBase<
::canvas::DisambiguationHelper< WindowGraphicDeviceBase_Base >,
SpriteDeviceHelper,
- tools::LocalGuard,
+ vclcanvastools::LocalGuard,
::cppu::OWeakObject >
SpriteCanvasBase_Base;
/** Mixin SpriteSurface
@@ -87,7 +87,7 @@ namespace vclcanvas
typedef ::canvas::SpriteCanvasBase< SpriteCanvasBaseSpriteSurface_Base,
SpriteCanvasHelper,
- tools::LocalGuard,
+ vclcanvastools::LocalGuard,
::cppu::OWeakObject >
SpriteCanvasBaseT;
/** Product of this component's factory.
diff --git a/canvas/source/vcl/spritecanvashelper.cxx
b/canvas/source/vcl/spritecanvashelper.cxx
index 9bd285e7cb50..8a0aa596cfd7 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -211,7 +211,7 @@ namespace vclcanvas
// actual OutputDevice is a shared resource - restore its
// state when done.
- tools::OutDevStateKeeper aStateKeeper( rOutDev );
+ vclcanvastools::OutDevStateKeeper aStateKeeper( rOutDev );
const Size aOutDevSize( rBackOutDev.GetOutputSizePixel() );
const Point aEmptyPoint(0,0);
diff --git a/canvas/source/vcl/spritedevicehelper.cxx
b/canvas/source/vcl/spritedevicehelper.cxx
index dd025bac6fbd..2ce87c400b30 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -44,7 +44,7 @@ namespace vclcanvas
mpBackBuffer = std::make_shared<BackBuffer>( rOutDev );
mpBackBuffer->setSize( rOutDev.GetOutputSizePixel() );
- tools::SetDefaultDeviceAntiAliasing( &mpBackBuffer->getOutDev());
+ vclcanvastools::SetDefaultDeviceAntiAliasing(
&mpBackBuffer->getOutDev());
}
bool SpriteDeviceHelper::showBuffer( bool, bool )
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 99f07b7ca8e1..eee738145080 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -348,7 +348,7 @@ namespace vclcanvas
// tdf#147999
// On Windows we get the wrong font width for fallback fonts unless we
setup again here.
vcl::Font aFont(rOutDev.GetFont());
- tools::setupFontWidth(mpFont->getFontMatrix(), aFont, rOutDev);
+ vclcanvastools::setupFontWidth(mpFont->getFontMatrix(), aFont,
rOutDev);
rOutDev.SetFont(aFont);
#endif
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 7199553f6223..5abd99b63041 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -350,11 +350,11 @@ class DemoRenderer
// mxCanvas->drawBitmap(xBitmap2, maViewState, maRenderState);
//yes, but where?
//cairo-canvas says:
//called CanvasHelper::getScaledBitmap, we return NULL, TODO
- //Exception 'BitmapEx vclcanvas::tools::bitmapExFromXBitmap(const
css::uno::Reference<css::rendering::XBitmap>&),
+ //Exception 'BitmapEx vclcanvastools::bitmapExFromXBitmap(const
css::uno::Reference<css::rendering::XBitmap>&),
//bitmapExFromXBitmap(): could not extract BitmapEx' thrown
//vcl-canvas says:
- //Exception 'BitmapEx vclcanvas::tools::bitmapExFromXBitmap(const
css::uno::Reference<css::rendering::XBitmap>&),
+ //Exception 'BitmapEx vclcanvastools::bitmapExFromXBitmap(const
css::uno::Reference<css::rendering::XBitmap>&),
//bitmapExFromXBitmap(): could not extract bitmap' thrown
// Thorsten says that this is a bug, and Thorsten never lies.
diff --git
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index e0b137e5eba7..76bb0a076dbd 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -17,7 +17,7 @@ binaryurp/source/writer.hxx:135
canvas/source/tools/surfaceproxy.hxx:104
canvas::SurfaceProxy mpPageManager PageManagerSharedPtr
canvas/source/vcl/impltools.hxx:95
- vclcanvas::tools::LocalGuard aSolarGuard SolarMutexGuard
+ vclcanvastools::LocalGuard aSolarGuard SolarMutexGuard
chart2/source/controller/accessibility/AccessibleChartShape.hxx:62
chart::AccessibleChartShape m_aShapeTreeInfo
::accessibility::AccessibleShapeTreeInfo
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:70
diff --git a/compilerplugins/clang/unusedfields.untouched.results
b/compilerplugins/clang/unusedfields.untouched.results
index 8055dc5dc717..ea8983b05040 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -9,7 +9,7 @@ basic/qa/cppunit/test_global_as_new.cxx:25
canvas/source/vcl/canvasbitmap.hxx:113
vclcanvas::CanvasBitmap mxDevice
css::uno::Reference<css::rendering::XGraphicDevice>
canvas/source/vcl/impltools.hxx:95
- vclcanvas::tools::LocalGuard aSolarGuard SolarMutexGuard
+ vclcanvastools::LocalGuard aSolarGuard SolarMutexGuard
chart2/source/controller/inc/dlg_DataEditor.hxx:48
chart::DataEditor m_xContext
css::uno::Reference<css::uno::XComponentContext>
chart2/source/inc/ModifyListenerCallBack.hxx:50
diff --git a/compilerplugins/clang/unusedmethods.results
b/compilerplugins/clang/unusedmethods.results
index 3b17176fd20f..2745e1860df7 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -39,7 +39,7 @@ canvas/inc/vclwrapper.hxx:138
canvas/source/vcl/canvasfont.hxx:76
const struct com::sun::star::geometry::Matrix2D &
vclcanvas::CanvasFont::getFontMatrix() const
canvas/source/vcl/impltools.hxx:83
- vclcanvas::tools::LocalGuard::LocalGuard()
+ vclcanvastools::LocalGuard::LocalGuard()
chart2/source/view/axes/VAxisBase.hxx:73
const std::shared_ptr<chart::DataTableView> &
chart::VAxisBase::getDataTableView()
connectivity/inc/sdbcx/VGroup.hxx:61
diff --git a/compilerplugins/clang/unusedvariableplus.cxx
b/compilerplugins/clang/unusedvariableplus.cxx
index e8a8385bb3cd..128da01f1d7b 100644
--- a/compilerplugins/clang/unusedvariableplus.cxx
+++ b/compilerplugins/clang/unusedvariableplus.cxx
@@ -437,7 +437,7 @@ public:
"utl::DisposableComponent",
"ValueCounter_Impl",
"VclListenerLock",
- "vclcanvas::tools::OutDevStateKeeper",
+ "vclcanvastools::OutDevStateKeeper",
"vcl::PaintBufferGuard",
"vcl::RoadmapWizardTravelSuspension",
"vcl::ScopedAntialiasing",
commit d7cd073911f1cd6cf6006852deef1355beb409ef
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 10:44:58 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:13 2025 +0200
dxcanvas::tools -> dxcanvastools
At least some IDEs are confused by our multitude of `tools` namespaces,
and show errors like `namespace "tools" is ambiguous`.
This removes one such namespace. The idea is to drop all but the one
in /tools (that has tools::Long and tools::Rectangle).
Change-Id: I33f59907216f1272dc8925ed7511a263966c6997
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189947
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/canvas/source/directx/dx_bitmap.cxx
b/canvas/source/directx/dx_bitmap.cxx
index 9e5f2348fa4f..743e81ace346 100644
--- a/canvas/source/directx/dx_bitmap.cxx
+++ b/canvas/source/directx/dx_bitmap.cxx
@@ -42,7 +42,7 @@ namespace dxcanvas
mpGdiPlusUser( GDIPlusUser::createInstance() ),
maSize(rBitmap->GetWidth(),rBitmap->GetHeight()),
mpBitmap(rBitmap),
- mpGraphics(tools::createGraphicsFromBitmap(mpBitmap)),
+ mpGraphics(dxcanvastools::createGraphicsFromBitmap(mpBitmap)),
mbAlpha(bWithAlpha)
{
}
@@ -71,7 +71,7 @@ namespace dxcanvas
PixelFormat24bppRGB);
}
- mpGraphics = tools::createGraphicsFromBitmap(mpBitmap);
+ mpGraphics = dxcanvastools::createGraphicsFromBitmap(mpBitmap);
}
BitmapSharedPtr DXBitmap::getBitmap() const
@@ -99,7 +99,7 @@ namespace dxcanvas
{
uno::Sequence< sal_Int8 > aRes( (rect.X2-rect.X1)*(rect.Y2-rect.Y1)*4
); // TODO(F1): Be format-agnostic here
- const Gdiplus::Rect aRect( tools::gdiPlusRectFromIntegerRectangle2D(
rect ) );
+ const Gdiplus::Rect aRect(
dxcanvastools::gdiPlusRectFromIntegerRectangle2D( rect ) );
Gdiplus::BitmapData aBmpData;
aBmpData.Width = rect.X2-rect.X1;
@@ -132,7 +132,7 @@ namespace dxcanvas
const rendering::IntegerBitmapLayout&
/*bitmapLayout*/,
const geometry::IntegerRectangle2D& rect )
{
- const Gdiplus::Rect aRect( tools::gdiPlusRectFromIntegerRectangle2D(
rect ) );
+ const Gdiplus::Rect aRect(
dxcanvastools::gdiPlusRectFromIntegerRectangle2D( rect ) );
Gdiplus::BitmapData aBmpData;
aBmpData.Width = rect.X2-rect.X1;
@@ -175,7 +175,7 @@ namespace dxcanvas
"CanvasHelper::setPixel: not enough color
components" );
if( Gdiplus::Ok != mpBitmap->SetPixel( pos.X, pos.Y,
- Gdiplus::Color(
tools::sequenceToArgb( color ))))
+ Gdiplus::Color(
dxcanvastools::sequenceToArgb( color ))))
{
throw uno::RuntimeException("SetPixel called with invalid x,y
points or color");
}
@@ -196,7 +196,7 @@ namespace dxcanvas
if( Gdiplus::Ok != mpBitmap->GetPixel( pos.X, pos.Y, &aColor ) )
return uno::Sequence< sal_Int8 >();
- return tools::argbToIntSequence(aColor.GetValue());
+ return dxcanvastools::argbToIntSequence(aColor.GetValue());
}
}
diff --git a/canvas/source/directx/dx_canvashelper.cxx
b/canvas/source/directx/dx_canvashelper.cxx
index 4f50fe372092..7cad6691fb77 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -195,7 +195,7 @@ namespace dxcanvas
Gdiplus::SolidBrush aBrush(
Gdiplus::Color(
- tools::sequenceToArgb(renderState.DeviceColor)) );
+ dxcanvastools::sequenceToArgb(renderState.DeviceColor)) );
// determine size of one-by-one device pixel ellipse
Gdiplus::Matrix aMatrix;
@@ -231,7 +231,7 @@ namespace dxcanvas
Gdiplus::Pen aPen(
Gdiplus::Color(
- tools::sequenceToArgb(renderState.DeviceColor)),
+ dxcanvastools::sequenceToArgb(renderState.DeviceColor)),
Gdiplus::REAL(0.0) );
// #122683# Switched precedence of pixel offset
@@ -270,7 +270,7 @@ namespace dxcanvas
Gdiplus::Pen aPen(
Gdiplus::Color(
- tools::sequenceToArgb(renderState.DeviceColor)),
+ dxcanvastools::sequenceToArgb(renderState.DeviceColor)),
Gdiplus::REAL(0.0) );
// #122683# Switched precedence of pixel offset
@@ -316,7 +316,7 @@ namespace dxcanvas
Gdiplus::Pen aPen(
Gdiplus::Color(
- tools::sequenceToArgb(renderState.DeviceColor)),
+ dxcanvastools::sequenceToArgb(renderState.DeviceColor)),
Gdiplus::REAL(0.0) );
// #122683# Switched precedence of pixel offset
@@ -328,7 +328,7 @@ namespace dxcanvas
pGraphics->GetPixelOffsetMode() );
pGraphics->SetPixelOffsetMode( Gdiplus::PixelOffsetModeNone );
- GraphicsPathSharedPtr pPath(
tools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ) );
+ GraphicsPathSharedPtr pPath(
dxcanvastools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ) );
// TODO(E1): Return value
Gdiplus::Status hr = pGraphics->DrawPath( &aPen, pPath.get() );
@@ -365,7 +365,7 @@ namespace dxcanvas
Gdiplus::Pen aPen(
Gdiplus::Color(
- tools::sequenceToArgb(renderState.DeviceColor)),
+ dxcanvastools::sequenceToArgb(renderState.DeviceColor)),
static_cast< Gdiplus::REAL >(strokeAttributes.StrokeWidth) );
// #122683# Switched precedence of pixel offset
@@ -397,7 +397,7 @@ namespace dxcanvas
if(!bIsNone)
aPen.SetLineJoin( gdiJoinFromJoin(strokeAttributes.JoinType) );
- GraphicsPathSharedPtr pPath(
tools::graphicsPathFromXPolyPolygon2D( xPolyPolygon, bIsNone ) );
+ GraphicsPathSharedPtr pPath(
dxcanvastools::graphicsPathFromXPolyPolygon2D( xPolyPolygon, bIsNone ) );
// TODO(E1): Return value
Gdiplus::Status hr = pGraphics->DrawPath( &aPen, pPath.get() );
@@ -461,9 +461,9 @@ namespace dxcanvas
setupGraphicsState( pGraphics, viewState, renderState );
Gdiplus::SolidBrush aBrush(
- tools::sequenceToArgb(renderState.DeviceColor));
+ dxcanvastools::sequenceToArgb(renderState.DeviceColor));
- GraphicsPathSharedPtr pPath(
tools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ) );
+ GraphicsPathSharedPtr pPath(
dxcanvastools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ) );
// TODO(F1): FillRule
ENSURE_OR_THROW( Gdiplus::Ok == pGraphics->FillPath( &aBrush,
pPath.get() ),
@@ -525,10 +525,10 @@ namespace dxcanvas
Gdiplus::SolidBrush aBrush(
Gdiplus::Color(
- tools::sequenceToArgb(renderState.DeviceColor)));
+ dxcanvastools::sequenceToArgb(renderState.DeviceColor)));
CanvasFont::ImplRef pFont(
- tools::canvasFontFromXFont(xFont) );
+ dxcanvastools::canvasFontFromXFont(xFont) );
// Move glyphs up, such that output happens at the font
// baseline.
@@ -612,9 +612,9 @@ namespace dxcanvas
setupGraphicsState( pGraphics, viewState, renderState );
if( pGdiBitmap )
- tools::drawGdiPlusBitmap(pGraphics,pGdiBitmap);
+ dxcanvastools::drawGdiPlusBitmap(pGraphics,pGdiBitmap);
else
- tools::drawVCLBitmapFromXBitmap(pGraphics,
+ dxcanvastools::drawVCLBitmapFromXBitmap(pGraphics,
xBitmap);
}
@@ -640,7 +640,7 @@ namespace dxcanvas
setupGraphicsState( pGraphics, viewState, renderState );
- BitmapSharedPtr pBitmap( tools::bitmapFromXBitmap( xBitmap ) );
+ BitmapSharedPtr pBitmap( dxcanvastools::bitmapFromXBitmap( xBitmap
) );
Gdiplus::Rect aRect( 0, 0,
pBitmap->GetWidth(),
pBitmap->GetHeight() );
@@ -651,7 +651,7 @@ namespace dxcanvas
mpDevice->getDeviceColorSpace()->convertToARGB(renderState.DeviceColor)[0]);
Gdiplus::ImageAttributes aImgAttr;
- tools::setModulateImageAttributes( aImgAttr,
+ dxcanvastools::setModulateImageAttributes( aImgAttr,
aARGBColor.Red,
aARGBColor.Green,
aARGBColor.Blue,
@@ -739,7 +739,7 @@ namespace dxcanvas
}
Gdiplus::Matrix aMatrix;
- tools::gdiPlusMatrixFromB2DHomMatrix( aMatrix, aTransform );
+ dxcanvastools::gdiPlusMatrixFromB2DHomMatrix( aMatrix, aTransform );
ENSURE_OR_THROW(
Gdiplus::Ok == rGraphics->SetTransform( &aMatrix ),
@@ -752,7 +752,7 @@ namespace dxcanvas
if( viewState.Clip.is() )
{
- GraphicsPathSharedPtr aClipPath(
tools::graphicsPathFromXPolyPolygon2D( viewState.Clip ) );
+ GraphicsPathSharedPtr aClipPath(
dxcanvastools::graphicsPathFromXPolyPolygon2D( viewState.Clip ) );
// TODO(P3): Cache clip. SetClip( GraphicsPath ) performs
abyssmally on GDI+.
// Try SetClip( Rect ) or similar for simple clip paths (need some
support in
@@ -777,7 +777,7 @@ namespace dxcanvas
aTransform = aOutputOffset * aTransform;
}
- tools::gdiPlusMatrixFromB2DHomMatrix( aMatrix, aTransform );
+ dxcanvastools::gdiPlusMatrixFromB2DHomMatrix( aMatrix, aTransform );
ENSURE_OR_THROW(
Gdiplus::Ok == rGraphics->SetTransform( &aMatrix ),
@@ -785,7 +785,7 @@ namespace dxcanvas
if( renderState.Clip.is() )
{
- GraphicsPathSharedPtr aClipPath(
tools::graphicsPathFromXPolyPolygon2D( renderState.Clip ) );
+ GraphicsPathSharedPtr aClipPath(
dxcanvastools::graphicsPathFromXPolyPolygon2D( renderState.Clip ) );
// TODO(P3): Cache clip. SetClip( GraphicsPath ) performs
abyssmally on GDI+.
// Try SetClip( Rect ) or similar for simple clip paths (need some
support in
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx
b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index 5244e0999b58..4cf7cec07004 100644
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -109,7 +109,7 @@ namespace dxcanvas
aLeftBottom,
aRightTop,
aRightBottom,
-
tools::b2dRangeFromGdiPlusRectF( aBounds ) );
+
dxcanvastools::b2dRangeFromGdiPlusRectF( aBounds ) );
// calc length of bound rect diagonal
const double nDiagonalLength(
@@ -177,7 +177,7 @@ namespace dxcanvas
// now, finally, output the gradient
Gdiplus::Matrix aMatrix;
- tools::gdiPlusMatrixFromAffineMatrix2D( aMatrix,
+ dxcanvastools::gdiPlusMatrixFromAffineMatrix2D( aMatrix,
texture.AffineTransform );
aBrush.SetTransform( &aMatrix );
@@ -372,10 +372,10 @@ namespace dxcanvas
// one sets both, only the translational components of the
// texture is respected.
- tools::gdiPlusMatrixFromAffineMatrix2D( aMatrix,
+ dxcanvastools::gdiPlusMatrixFromAffineMatrix2D( aMatrix,
texture.AffineTransform );
GraphicsPathSharedPtr pGradientPath(
- tools::graphicsPathFromB2DPolygon( rValues.maGradientPoly
));
+ dxcanvastools::graphicsPathFromB2DPolygon(
rValues.maGradientPoly ));
pGradientPath->Transform( &aMatrix );
pGradientBrush
@@ -485,7 +485,7 @@ namespace dxcanvas
// layer presents background object bitmap in that
// way!)
BitmapSharedPtr pBitmap(
- tools::bitmapFromXBitmap( xBitmap ) );
+ dxcanvastools::bitmapFromXBitmap( xBitmap ) );
TextureBrushSharedPtr pBrush;
if( ::rtl::math::approxEqual( rTexture.Alpha,
@@ -499,7 +499,7 @@ namespace dxcanvas
{
Gdiplus::ImageAttributes aImgAttr;
- tools::setModulateImageAttributes( aImgAttr,
+ dxcanvastools::setModulateImageAttributes( aImgAttr,
1.0,
1.0,
1.0,
@@ -518,7 +518,7 @@ namespace dxcanvas
}
Gdiplus::Matrix aTextureTransform;
- tools::gdiPlusMatrixFromAffineMatrix2D( aTextureTransform,
+ dxcanvastools::gdiPlusMatrixFromAffineMatrix2D( aTextureTransform,
rTexture.AffineTransform );
// scale down bitmap to [0,1]x[0,1] rect, as required
@@ -573,7 +573,7 @@ namespace dxcanvas
std::transform(&rValues.maColors[0],
&rValues.maColors[0]+rValues.maColors.getLength(),
aColors.begin(),
- [](const uno::Sequence< double >&
aDoubleSequence) { return tools::sequenceToArgb(aDoubleSequence); } );
+ [](const uno::Sequence< double >&
aDoubleSequence) { return dxcanvastools::sequenceToArgb(aDoubleSequence); } );
std::vector< Gdiplus::REAL > aStops;
comphelper::sequenceToContainer(aStops,rValues.maStops);
@@ -583,7 +583,7 @@ namespace dxcanvas
aColors,
aStops,
pGraphics,
- tools::graphicsPathFromXPolyPolygon2D(
xPolyPolygon ),
+
dxcanvastools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ),
viewState,
renderState,
textures[0] );
@@ -595,7 +595,7 @@ namespace dxcanvas
// TODO(F1): FillRule
fillBitmap( textures[0].Bitmap,
pGraphics,
- tools::graphicsPathFromXPolyPolygon2D(
xPolyPolygon ),
+ dxcanvastools::graphicsPathFromXPolyPolygon2D(
xPolyPolygon ),
textures[0] );
}
}
diff --git a/canvas/source/directx/dx_impltools.cxx
b/canvas/source/directx/dx_impltools.cxx
index 4600dd5788c4..12a1aa2b5634 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -52,7 +52,7 @@
using namespace ::com::sun::star;
-namespace dxcanvas::tools
+namespace dxcanvastools
{
::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( const
uno::Reference< rendering::XPolyPolygon2D >& xPoly )
{
@@ -464,7 +464,7 @@ namespace dxcanvas::tools
}
else
{
- return tools::graphicsPathFromB2DPolyPolygon(
+ return graphicsPathFromB2DPolyPolygon(
polyPolygonFromXPolyPolygon2D( xPoly ), bNoLineJoin );
}
}
@@ -558,7 +558,7 @@ namespace dxcanvas::tools
}
GraphicsSharedPtr pGraphics(createGraphicsFromBitmap(pBitmap));
- tools::setupGraphics(*pGraphics);
+ setupGraphics(*pGraphics);
if( !drawVCLBitmapFromXBitmap(
pGraphics,
xBitmap) )
@@ -624,6 +624,6 @@ namespace dxcanvas::tools
o_rAttr.SetColorMatrix( &aColorMatrix );
}
-} // namespace dxcanvas::tools
+} // namespace dxcanvastools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_impltools.hxx
b/canvas/source/directx/dx_impltools.hxx
index 2c6b85ce83ff..3bc5ec65ca27 100644
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -53,8 +53,10 @@ namespace com::sun::star::rendering
}
-namespace dxcanvas::tools
+namespace dxcanvastools
{
+using namespace dxcanvas;
+
struct RawRGBABitmap;
::basegfx::B2DPolyPolygon
diff --git a/canvas/source/directx/dx_linepolypolygon.cxx
b/canvas/source/directx/dx_linepolypolygon.cxx
index 53ec2953e78f..cacd4d021987 100644
--- a/canvas/source/directx/dx_linepolypolygon.cxx
+++ b/canvas/source/directx/dx_linepolypolygon.cxx
@@ -42,7 +42,7 @@ namespace dxcanvas
// B2DPolyPolygon).
if( !mpPath )
{
- mpPath = tools::graphicsPathFromB2DPolyPolygon(
getPolyPolygonUnsafe(), bNoLineJoin );
+ mpPath = dxcanvastools::graphicsPathFromB2DPolyPolygon(
getPolyPolygonUnsafe(), bNoLineJoin );
mpPath->SetFillMode(
const_cast<LinePolyPolygon*>(this)->getFillRule() ==
rendering::FillRule_EVEN_ODD ?
Gdiplus::FillModeAlternate :
Gdiplus::FillModeWinding );
}
diff --git a/canvas/source/directx/dx_spritehelper.cxx
b/canvas/source/directx/dx_spritehelper.cxx
index 3cb211886a3c..563014ea1f39 100644
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.cxx
@@ -81,7 +81,7 @@ namespace dxcanvas
::basegfx::B2DPolyPolygon SpriteHelper::polyPolygonFromXPolyPolygon2D(
uno::Reference< rendering::XPolyPolygon2D >& xPoly ) const
{
- return tools::polyPolygonFromXPolyPolygon2D( xPoly );
+ return dxcanvastools::polyPolygonFromXPolyPolygon2D( xPoly );
}
bool SpriteHelper::needRedraw() const
@@ -141,7 +141,7 @@ namespace dxcanvas
if( xClip.is() )
{
- aClipPath = tools::polyPolygonFromXPolyPolygon2D( xClip );
+ aClipPath = dxcanvastools::polyPolygonFromXPolyPolygon2D(
xClip );
const sal_Int32 nNumClipPolygons( aClipPath.count() );
if( nNumClipPolygons )
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx
b/canvas/source/directx/dx_surfacebitmap.cxx
index c425af2911ce..84510fd6cacb 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -228,7 +228,7 @@ namespace dxcanvas
maSize.getHeight(),
PixelFormat32bppARGB
);
- mpGraphics = tools::createGraphicsFromBitmap(mpGDIPlusBitmap);
+ mpGraphics =
dxcanvastools::createGraphicsFromBitmap(mpGDIPlusBitmap);
// create the colorbuffer object, which is basically a simple
// wrapper around the directx surface. the colorbuffer is the
@@ -420,7 +420,7 @@ namespace dxcanvas
{
uno::Sequence< sal_Int8 > aRes(
(rect.X2-rect.X1)*(rect.Y2-rect.Y1)*4 ); // TODO(F1): Be format-agnostic here
- const Gdiplus::Rect aRect(
tools::gdiPlusRectFromIntegerRectangle2D( rect ) );
+ const Gdiplus::Rect aRect(
dxcanvastools::gdiPlusRectFromIntegerRectangle2D( rect ) );
Gdiplus::BitmapData aBmpData;
aBmpData.Width = rect.X2-rect.X1;
@@ -507,7 +507,7 @@ namespace dxcanvas
{
if(hasAlpha())
{
- const Gdiplus::Rect aRect(
tools::gdiPlusRectFromIntegerRectangle2D( rect ) );
+ const Gdiplus::Rect aRect(
dxcanvastools::gdiPlusRectFromIntegerRectangle2D( rect ) );
Gdiplus::BitmapData aBmpData;
aBmpData.Width = rect.X2-rect.X1;
@@ -578,7 +578,7 @@ namespace dxcanvas
"CanvasHelper::setPixel: not enough color
components" );
if( Gdiplus::Ok != mpGDIPlusBitmap->SetPixel( pos.X, pos.Y,
- Gdiplus::Color(
tools::sequenceToArgb( color ))))
+ Gdiplus::Color(
dxcanvastools::sequenceToArgb( color ))))
{
throw uno::RuntimeException("Problem with setting the color of
bitmap object");
}
@@ -592,7 +592,7 @@ namespace dxcanvas
ENSURE_ARG_OR_THROW( color.getLength() > 3,
"CanvasHelper::setPixel: not enough color
components" );
- Gdiplus::Color aColor(tools::sequenceToArgb(color));
+ Gdiplus::Color aColor(dxcanvastools::sequenceToArgb(color));
// lock the directx surface to receive the pointer to the surface
memory.
D3DLOCKED_RECT aLockedRect;
@@ -628,7 +628,7 @@ namespace dxcanvas
if( Gdiplus::Ok != mpGDIPlusBitmap->GetPixel( pos.X, pos.Y,
&aColor ) )
return uno::Sequence< sal_Int8 >();
- return tools::argbToIntSequence(aColor.GetValue());
+ return dxcanvastools::argbToIntSequence(aColor.GetValue());
}
else
{
@@ -646,7 +646,7 @@ namespace dxcanvas
Gdiplus::Color aColor(*pDst);
mpSurface->UnlockRect();
- return tools::argbToIntSequence(aColor.GetValue());
+ return dxcanvastools::argbToIntSequence(aColor.GetValue());
}
}
}
diff --git a/canvas/source/directx/dx_surfacegraphics.cxx
b/canvas/source/directx/dx_surfacegraphics.cxx
index 075f2fc15341..a7bfd1cf8879 100644
--- a/canvas/source/directx/dx_surfacegraphics.cxx
+++ b/canvas/source/directx/dx_surfacegraphics.cxx
@@ -61,7 +61,7 @@ namespace dxcanvas
Gdiplus::Graphics* pGraphics = Gdiplus::Graphics::FromHDC( aHDC );
if(pGraphics)
{
- tools::setupGraphics( *pGraphics );
+ dxcanvastools::setupGraphics( *pGraphics );
pRet.reset(pGraphics,
GraphicsDeleter(rSurface, aHDC));
return pRet;
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 1ae8de2d5194..ced84e58b7ce 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -129,7 +129,7 @@ namespace dxcanvas
aFont.SetColor( aColor );
aFont.SetFillColor( aColor );
- CanvasFont::ImplRef pFont(tools::canvasFontFromXFont(rCanvasFont));
+ CanvasFont::ImplRef
pFont(dxcanvastools::canvasFontFromXFont(rCanvasFont));
if (pFont.is() && pFont->getEmphasisMark())
aFont.SetEmphasisMark(FontEmphasisMark(pFont->getEmphasisMark()));
@@ -163,7 +163,7 @@ namespace dxcanvas
// set ViewState clipping
if(rViewState.Clip.is())
{
- ::basegfx::B2DPolyPolygon
aClipPoly(dxcanvas::tools::polyPolygonFromXPolyPolygon2D(rViewState.Clip));
+ ::basegfx::B2DPolyPolygon
aClipPoly(dxcanvastools::polyPolygonFromXPolyPolygon2D(rViewState.Clip));
::basegfx::B2DHomMatrix aMatrix;
::basegfx::unotools::homMatrixFromAffineMatrix(aMatrix,
rViewState.AffineTransform );
@@ -179,7 +179,7 @@ namespace dxcanvas
if(rRenderState.Clip.is())
{
- ::basegfx::B2DPolyPolygon
aClipPoly(dxcanvas::tools::polyPolygonFromXPolyPolygon2D(rRenderState.Clip));
+ ::basegfx::B2DPolyPolygon
aClipPoly(dxcanvastools::polyPolygonFromXPolyPolygon2D(rRenderState.Clip));
aClipPoly.transform(aWorldTransform);
const vcl::Region& rClipRegion =
vcl::Region(::tools::PolyPolygon(aClipPoly));
xVirtualDevice->IntersectClipRegion(rClipRegion);
@@ -277,7 +277,7 @@ namespace dxcanvas
aFont.SetAverageFontWidth( nNewWidth );
}
- CanvasFont::ImplRef pFont(tools::canvasFontFromXFont(rCanvasFont));
+ CanvasFont::ImplRef
pFont(dxcanvastools::canvasFontFromXFont(rCanvasFont));
if (pFont.is() && pFont->getEmphasisMark())
aFont.SetEmphasisMark(FontEmphasisMark(pFont->getEmphasisMark()));
diff --git a/canvas/source/directx/dx_vcltools.cxx
b/canvas/source/directx/dx_vcltools.cxx
index 4b11ffaea6d5..138690ed2ee8 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -33,7 +33,7 @@
using namespace ::com::sun::star;
-namespace dxcanvas::tools
+namespace dxcanvastools
{
namespace
{
@@ -76,7 +76,7 @@ namespace dxcanvas::tools
// forward to outsourced GDI+ rendering method
// (header clashes)
- bRet = tools::drawDIBits( rGraphics, *pBI, pBits );
+ bRet = dxcanvastools::drawDIBits( rGraphics, *pBI, pBits );
}
return bRet;
@@ -137,7 +137,7 @@ namespace dxcanvas::tools
// duplicating the memory used)
ENSURE_OR_THROW( rBmpEx.IsAlpha(),
- "::dxcanvas::tools::bitmapFromVCLBitmapEx():
"
+ "::dxcanvastools::bitmapFromVCLBitmapEx(): "
"BmpEx has no alpha" );
// convert transparent bitmap to 32bit RGBA
@@ -158,7 +158,7 @@ namespace dxcanvas::tools
const sal_Int32 nHeight( aBmpSize.Height() );
ENSURE_OR_THROW( pReadAccess.get() != nullptr,
- "::dxcanvas::tools::bitmapFromVCLBitmapEx():
"
+ "::dxcanvastools::bitmapFromVCLBitmapEx(): "
"Unable to acquire read access to bitmap" );
Bitmap aAlpha( rBmpEx.GetAlphaMask().GetBitmap() );
@@ -179,11 +179,11 @@ namespace dxcanvas::tools
// buffer
ENSURE_OR_THROW( pAlphaReadAccess.get() != nullptr,
- "::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
+ "::dxcanvastools::bitmapFromVCLBitmapEx(): "
"Unable to acquire read access to alpha" );
ENSURE_OR_THROW( pAlphaReadAccess->GetScanlineFormat() ==
ScanlineFormat::N8BitPal,
- "::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
+ "::dxcanvastools::bitmapFromVCLBitmapEx(): "
"Unsupported alpha scanline format" );
BitmapColor aCol;
@@ -260,7 +260,7 @@ namespace dxcanvas::tools
case ScanlineFormat::N32BitTcRgbx:
default:
ENSURE_OR_THROW( false,
-
"::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
+
"::dxcanvastools::bitmapFromVCLBitmapEx(): "
"Unexpected scanline format - has "
"WinSalBitmap::AcquireBuffer()
changed?" );
}
diff --git a/canvas/source/directx/dx_vcltools.hxx
b/canvas/source/directx/dx_vcltools.hxx
index 433afa618eb7..41445dd25102 100644
--- a/canvas/source/directx/dx_vcltools.hxx
+++ b/canvas/source/directx/dx_vcltools.hxx
@@ -26,7 +26,7 @@
namespace Gdiplus { class Graphics; }
-namespace dxcanvas::tools
+namespace dxcanvastools
{
/** Raw RGBA bitmap data,
contiguous in memory
commit f9c16559a8b3df1639ba89a2e1fabed428e8c170
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 12:05:06 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:07 2025 +0200
canvas::tools -> canvastools
At least some IDEs are confused by our multitude of `tools` namespaces,
and show errors like `namespace "tools" is ambiguous`.
This removes one such namespace. The idea is to drop all but the one
in /tools (that has tools::Long and tools::Rectangle).
Change-Id: I6077f50ad0fcc49abfadc75d9948ab63df829ff9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189948
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/bin/find-can-be-private-symbols.functions.results
b/bin/find-can-be-private-symbols.functions.results
index 5544a507a936..fd2aebafc784 100644
--- a/bin/find-can-be-private-symbols.functions.results
+++ b/bin/find-can-be-private-symbols.functions.results
@@ -10568,10 +10568,10 @@
canvas::ParametricPolyPolygon::~ParametricPolyPolygon()
canvas::PropertySetHelper::isPropertyName(rtl::OUString const&) const
canvas::SpriteRedrawManager::isAreaUpdateNotOpaque(basegfx::B2DRange const&,
std::pair<basegfx::B2DRange, canvas::SpriteRedrawManager::SpriteInfo> const&)
const
canvas::createSurfaceProxyManager(std::shared_ptr<canvas::IRenderModule>
const&)
-canvas::tools::ElapsedTime::getCurrentTime() const
-canvas::tools::ElapsedTime::getElapsedTimeImpl() const
-canvas::tools::ElapsedTime::getSystemTime()
-canvas::tools::isInside(basegfx::B2DRange const&, basegfx::B2DRange const&,
basegfx::B2DHomMatrix const&)
+canvastools::ElapsedTime::getCurrentTime() const
+canvastools::ElapsedTime::getElapsedTimeImpl() const
+canvastools::ElapsedTime::getSystemTime()
+canvastools::isInside(basegfx::B2DRange const&, basegfx::B2DRange const&,
basegfx::B2DHomMatrix const&)
chart::AddPointToPoly(com::sun::star::drawing::PolyPolygonShape3D&,
com::sun::star::drawing::Position3D const&, int)
chart::AddPointToPoly(std::__debug::vector<std::__debug::vector<com::sun::star::drawing::Position3D,
std::allocator<com::sun::star::drawing::Position3D> >,
std::allocator<std::__debug::vector<com::sun::star::drawing::Position3D,
std::allocator<com::sun::star::drawing::Position3D> > > >&,
com::sun::star::drawing::Position3D const&, int)
chart::Axis::AllocateSubGrids()
diff --git a/bin/find-mergedlib-can-be-private-symbols.functions.results
b/bin/find-mergedlib-can-be-private-symbols.functions.results
index 06d19bb4f6d2..c94c575267a0 100644
--- a/bin/find-mergedlib-can-be-private-symbols.functions.results
+++ b/bin/find-mergedlib-can-be-private-symbols.functions.results
@@ -11188,12 +11188,12 @@ canvas::ParametricPolyPolygon::getValues() const
canvas::ParametricPolyPolygon::supportsService(rtl::OUString const&)
canvas::ParametricPolyPolygon::~ParametricPolyPolygon()
canvas::PropertySetHelper::PropertySetHelper()
-canvas::PropertySetHelper::addProperties(std::vector<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry,
std::allocator<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry>
> const&)
+canvas::PropertySetHelper::addProperties(std::vector<canvastools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry,
std::allocator<canvastools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry>
> const&)
canvas::PropertySetHelper::addPropertyChangeListener(rtl::OUString const&,
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>
const&)
canvas::PropertySetHelper::addVetoableChangeListener(rtl::OUString const&,
com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>
const&)
canvas::PropertySetHelper::getPropertySetInfo() const
canvas::PropertySetHelper::getPropertyValue(rtl::OUString const&) const
-canvas::PropertySetHelper::initProperties(std::vector<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry,
std::allocator<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry>
>&&)
+canvas::PropertySetHelper::initProperties(std::vector<canvastools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry,
std::allocator<canvastools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry>
>&&)
canvas::PropertySetHelper::isPropertyName(rtl::OUString const&) const
canvas::PropertySetHelper::setPropertyValue(rtl::OUString const&,
com::sun::star::uno::Any const&)
canvas::SpriteRedrawManager::SpriteRedrawManager()
@@ -11209,45 +11209,45 @@
canvas::SpriteRedrawManager::setupUpdateAreas(basegfx::B2DConnectedRanges<canvas
canvas::SpriteRedrawManager::showSprite(rtl::Reference<canvas::Sprite> const&)
canvas::SpriteRedrawManager::updateSprite(rtl::Reference<canvas::Sprite>
const&, basegfx::B2DPoint const&, basegfx::B2DRange const&)
canvas::createSurfaceProxyManager(std::shared_ptr<canvas::IRenderModule>
const&)
-canvas::tools::ElapsedTime::getCurrentTime() const
-canvas::tools::ElapsedTime::getElapsedTimeImpl() const
-canvas::tools::ElapsedTime::getSystemTime()
-canvas::tools::appendToRenderState(com::sun::star::rendering::RenderState&,
basegfx::B2DHomMatrix const&)
-canvas::tools::calcGradientStepCount(basegfx::B2DHomMatrix&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&,
com::sun::star::rendering::Texture const&, int)
-canvas::tools::calcRectToOriginTransform(basegfx::B2DHomMatrix&,
basegfx::B2DRange const&, basegfx::B2DHomMatrix const&)
-canvas::tools::clipOutDev(com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&, OutputDevice&, OutputDevice*)
-canvas::tools::clipScrollArea(basegfx::B2IRange&, basegfx::B2IPoint&,
std::vector<basegfx::B2IRange, std::allocator<basegfx::B2IRange> >&,
basegfx::B2IRange const&)
-canvas::tools::colorToStdIntSequence(Color const&)
-canvas::tools::createInfiniteSize2D()
-canvas::tools::extractExtraFontProperties(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
const&, unsigned int&)
-canvas::tools::getAbsoluteWindowRect(com::sun::star::awt::Rectangle const&,
com::sun::star::uno::Reference<com::sun::star::awt::XWindow2> const&)
-canvas::tools::getBoundMarksPolyPolygon(basegfx::B2DRange const&)
-canvas::tools::getRenderStateTransform(basegfx::B2DHomMatrix&,
com::sun::star::rendering::RenderState const&)
-canvas::tools::getStdColorSpace()
-canvas::tools::getStdColorSpaceWithoutAlpha()
-canvas::tools::getStdMemoryLayout(com::sun::star::geometry::IntegerSize2D
const&)
-canvas::tools::getViewStateTransform(basegfx::B2DHomMatrix&,
com::sun::star::rendering::ViewState const&)
-canvas::tools::isInside(basegfx::B2DRange const&, basegfx::B2DRange const&,
basegfx::B2DHomMatrix const&)
-canvas::tools::mergeViewAndRenderTransform(basegfx::B2DHomMatrix&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&)
-canvas::tools::prependToRenderState(com::sun::star::rendering::RenderState&,
basegfx::B2DHomMatrix const&)
-canvas::tools::setIdentityMatrix2D(com::sun::star::geometry::Matrix2D&)
-canvas::tools::setViewStateTransform(com::sun::star::rendering::ViewState&,
basegfx::B2DHomMatrix const&)
-canvas::tools::spritePixelAreaFromB2DRange(basegfx::B2DRange const&)
-canvas::tools::verifyBitmapSize(com::sun::star::geometry::IntegerSize2D
const&, char const*,
com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
-canvas::tools::verifyIndexRange(com::sun::star::geometry::IntegerPoint2D
const&, com::sun::star::geometry::IntegerSize2D const&)
-canvas::tools::verifyIndexRange(com::sun::star::geometry::IntegerRectangle2D
const&, com::sun::star::geometry::IntegerSize2D const&)
-canvas::tools::verifyInput(com::sun::star::geometry::AffineMatrix2D const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&, short)
-canvas::tools::verifyInput(com::sun::star::geometry::Matrix2D const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
-canvas::tools::verifyInput(com::sun::star::geometry::RealBezierSegment2D
const&, char const*,
com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
-canvas::tools::verifyInput(com::sun::star::geometry::RealPoint2D const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
-canvas::tools::verifyInput(com::sun::star::geometry::RealRectangle2D const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&, short)
-canvas::tools::verifyInput(com::sun::star::rendering::FontRequest const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
-canvas::tools::verifyInput(com::sun::star::rendering::IntegerBitmapLayout
const&, char const*,
com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
-canvas::tools::verifyInput(com::sun::star::rendering::RenderState const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short, int)
-canvas::tools::verifyInput(com::sun::star::rendering::StrokeAttributes const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&, short)
-canvas::tools::verifyInput(com::sun::star::rendering::Texture const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
-canvas::tools::verifyInput(com::sun::star::rendering::ViewState const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
-canvas::tools::verifySpriteSize(com::sun::star::geometry::RealSize2D const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&)
+canvastools::ElapsedTime::getCurrentTime() const
+canvastools::ElapsedTime::getElapsedTimeImpl() const
+canvastools::ElapsedTime::getSystemTime()
+canvastools::appendToRenderState(com::sun::star::rendering::RenderState&,
basegfx::B2DHomMatrix const&)
+canvastools::calcGradientStepCount(basegfx::B2DHomMatrix&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&,
com::sun::star::rendering::Texture const&, int)
+canvastools::calcRectToOriginTransform(basegfx::B2DHomMatrix&,
basegfx::B2DRange const&, basegfx::B2DHomMatrix const&)
+canvastools::clipOutDev(com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&, OutputDevice&, OutputDevice*)
+canvastools::clipScrollArea(basegfx::B2IRange&, basegfx::B2IPoint&,
std::vector<basegfx::B2IRange, std::allocator<basegfx::B2IRange> >&,
basegfx::B2IRange const&)
+canvastools::colorToStdIntSequence(Color const&)
+canvastools::createInfiniteSize2D()
+canvastools::extractExtraFontProperties(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
const&, unsigned int&)
+canvastools::getAbsoluteWindowRect(com::sun::star::awt::Rectangle const&,
com::sun::star::uno::Reference<com::sun::star::awt::XWindow2> const&)
+canvastools::getBoundMarksPolyPolygon(basegfx::B2DRange const&)
+canvastools::getRenderStateTransform(basegfx::B2DHomMatrix&,
com::sun::star::rendering::RenderState const&)
+canvastools::getStdColorSpace()
+canvastools::getStdColorSpaceWithoutAlpha()
+canvastools::getStdMemoryLayout(com::sun::star::geometry::IntegerSize2D const&)
+canvastools::getViewStateTransform(basegfx::B2DHomMatrix&,
com::sun::star::rendering::ViewState const&)
+canvastools::isInside(basegfx::B2DRange const&, basegfx::B2DRange const&,
basegfx::B2DHomMatrix const&)
+canvastools::mergeViewAndRenderTransform(basegfx::B2DHomMatrix&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&)
+canvastools::prependToRenderState(com::sun::star::rendering::RenderState&,
basegfx::B2DHomMatrix const&)
+canvastools::setIdentityMatrix2D(com::sun::star::geometry::Matrix2D&)
+canvastools::setViewStateTransform(com::sun::star::rendering::ViewState&,
basegfx::B2DHomMatrix const&)
+canvastools::spritePixelAreaFromB2DRange(basegfx::B2DRange const&)
+canvastools::verifyBitmapSize(com::sun::star::geometry::IntegerSize2D const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&)
+canvastools::verifyIndexRange(com::sun::star::geometry::IntegerPoint2D const&,
com::sun::star::geometry::IntegerSize2D const&)
+canvastools::verifyIndexRange(com::sun::star::geometry::IntegerRectangle2D
const&, com::sun::star::geometry::IntegerSize2D const&)
+canvastools::verifyInput(com::sun::star::geometry::AffineMatrix2D const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
+canvastools::verifyInput(com::sun::star::geometry::Matrix2D const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
+canvastools::verifyInput(com::sun::star::geometry::RealBezierSegment2D const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&, short)
+canvastools::verifyInput(com::sun::star::geometry::RealPoint2D const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
+canvastools::verifyInput(com::sun::star::geometry::RealRectangle2D const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&, short)
+canvastools::verifyInput(com::sun::star::rendering::FontRequest const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
+canvastools::verifyInput(com::sun::star::rendering::IntegerBitmapLayout
const&, char const*,
com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
+canvastools::verifyInput(com::sun::star::rendering::RenderState const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short, int)
+canvastools::verifyInput(com::sun::star::rendering::StrokeAttributes const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&, short)
+canvastools::verifyInput(com::sun::star::rendering::Texture const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
+canvastools::verifyInput(com::sun::star::rendering::ViewState const&, char
const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&,
short)
+canvastools::verifySpriteSize(com::sun::star::geometry::RealSize2D const&,
char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
const&)
chart::AddPointToPoly(com::sun::star::drawing::PolyPolygonShape3D&,
com::sun::star::drawing::Position3D const&, int)
chart::AddPointToPoly(std::vector<std::vector<com::sun::star::drawing::Position3D,
std::allocator<com::sun::star::drawing::Position3D> >,
std::allocator<std::vector<com::sun::star::drawing::Position3D,
std::allocator<com::sun::star::drawing::Position3D> > > >&,
com::sun::star::drawing::Position3D const&, int)
chart::B2DHomMatrixToHomogenMatrix3(basegfx::B2DHomMatrix const&)
diff --git a/canvas/inc/base/bitmapcanvasbase.hxx
b/canvas/inc/base/bitmapcanvasbase.hxx
index 1293f301fdb1..c9fabfd99ca2 100644
--- a/canvas/inc/base/bitmapcanvasbase.hxx
+++ b/canvas/inc/base/bitmapcanvasbase.hxx
@@ -110,7 +110,7 @@ namespace canvas
const css::rendering::ViewState&
destViewState,
const css::rendering::RenderState&
destRenderState ) override
{
- tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState,
sourceRenderState,
+ canvastools::verifyArgs(sourceCanvas, sourceRect, sourceViewState,
sourceRenderState,
destRect, destViewState, destRenderState,
__func__,
static_cast< typename
BaseType::UnambiguousBaseType* >(this));
diff --git a/canvas/inc/base/bufferedgraphicdevicebase.hxx
b/canvas/inc/base/bufferedgraphicdevicebase.hxx
index f07c8de23099..291432bb1aa2 100644
--- a/canvas/inc/base/bufferedgraphicdevicebase.hxx
+++ b/canvas/inc/base/bufferedgraphicdevicebase.hxx
@@ -97,7 +97,7 @@ namespace canvas
// XBufferController
virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers )
override
{
- tools::verifyRange( nBuffers, sal_Int32(1) );
+ canvastools::verifyRange( nBuffers, sal_Int32(1) );
return 1;
}
@@ -176,7 +176,7 @@ namespace canvas
// notifySizeUpdate's bounds are relative to the toplevel
// window
if( !mbIsTopLevel )
- return tools::getAbsoluteWindowRect(
+ return canvastools::getAbsoluteWindowRect(
rBounds,
mxWindow );
else
diff --git a/canvas/inc/base/canvasbase.hxx b/canvas/inc/base/canvasbase.hxx
index 24737f784d59..48ccd50b0552 100644
--- a/canvas/inc/base/canvasbase.hxx
+++ b/canvas/inc/base/canvasbase.hxx
@@ -144,7 +144,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState) override
{
- tools::verifyArgs(aPoint, viewState, renderState,
+ canvastools::verifyArgs(aPoint, viewState, renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -158,7 +158,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState) override
{
- tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState,
+ canvastools::verifyArgs(aStartPoint, aEndPoint, viewState,
renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -174,7 +174,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState ) override
{
- tools::verifyArgs(aBezierSegment, aEndPoint, viewState,
renderState,
+ canvastools::verifyArgs(aBezierSegment, aEndPoint, viewState,
renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -190,7 +190,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState) override
{
- tools::verifyArgs(xPolyPolygon, viewState, renderState,
+ canvastools::verifyArgs(xPolyPolygon, viewState, renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -207,7 +207,7 @@ namespace canvas
const css::rendering::RenderState&
renderState,
const css::rendering::StrokeAttributes&
strokeAttributes) override
{
- tools::verifyArgs(xPolyPolygon, viewState, renderState,
strokeAttributes,
+ canvastools::verifyArgs(xPolyPolygon, viewState, renderState,
strokeAttributes,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -225,7 +225,7 @@ namespace canvas
const css::uno::Sequence<
css::rendering::Texture >& textures,
const css::rendering::StrokeAttributes&
strokeAttributes ) override
{
- tools::verifyArgs(xPolyPolygon, viewState, renderState,
strokeAttributes,
+ canvastools::verifyArgs(xPolyPolygon, viewState, renderState,
strokeAttributes,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -244,7 +244,7 @@ namespace canvas
const css::uno::Reference<
css::geometry::XMapping2D >& xMapping,
const
css::rendering::StrokeAttributes& strokeAttributes )
override
{
- tools::verifyArgs(xPolyPolygon, viewState, renderState, textures,
xMapping, strokeAttributes,
+ canvastools::verifyArgs(xPolyPolygon, viewState, renderState,
textures, xMapping, strokeAttributes,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -261,7 +261,7 @@ namespace canvas
const css::rendering::RenderState&
renderState,
const css::rendering::StrokeAttributes&
strokeAttributes ) override
{
- tools::verifyArgs(xPolyPolygon, viewState, renderState,
strokeAttributes,
+ canvastools::verifyArgs(xPolyPolygon, viewState, renderState,
strokeAttributes,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -277,7 +277,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState) override
{
- tools::verifyArgs(xPolyPolygon, viewState, renderState,
+ canvastools::verifyArgs(xPolyPolygon, viewState, renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -294,7 +294,7 @@ namespace canvas
const css::rendering::RenderState&
renderState,
const css::uno::Sequence<
css::rendering::Texture >& textures) override
{
- tools::verifyArgs(xPolyPolygon, viewState, renderState, textures,
+ canvastools::verifyArgs(xPolyPolygon, viewState, renderState,
textures,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -312,7 +312,7 @@ namespace canvas
const css::uno::Sequence<
css::rendering::Texture >& textures,
const css::uno::Reference<
css::geometry::XMapping2D >& xMapping ) override
{
- tools::verifyArgs(xPolyPolygon, viewState, renderState, textures,
xMapping,
+ canvastools::verifyArgs(xPolyPolygon, viewState, renderState,
textures, xMapping,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -329,7 +329,7 @@ namespace canvas
const css::uno::Sequence< css::beans::PropertyValue >&
extraFontProperties,
const css::geometry::Matrix2D&
fontMatrix ) override
{
- tools::verifyArgs(fontRequest,
+ canvastools::verifyArgs(fontRequest,
// dummy, to keep argPos in sync
fontRequest,
fontMatrix,
@@ -346,7 +346,7 @@ namespace canvas
queryAvailableFonts( const css::rendering::FontInfo&
aFilter,
const css::uno::Sequence<
css::beans::PropertyValue >& aFontProperties ) override
{
- tools::verifyArgs(aFilter,
+ canvastools::verifyArgs(aFilter,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -363,10 +363,10 @@ namespace canvas
const css::rendering::RenderState&
renderState,
sal_Int8
textDirection) override
{
- tools::verifyArgs(xFont, viewState, renderState,
+ canvastools::verifyArgs(xFont, viewState, renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
- tools::verifyRange( textDirection,
+ canvastools::verifyRange( textDirection,
css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
css::rendering::TextDirection::STRONG_RIGHT_TO_LEFT );
@@ -383,7 +383,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState) override
{
- tools::verifyArgs(laidOutText, viewState, renderState,
+ canvastools::verifyArgs(laidOutText, viewState, renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -400,7 +400,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState ) override
{
- tools::verifyArgs(xBitmap, viewState, renderState,
+ canvastools::verifyArgs(xBitmap, viewState, renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -416,7 +416,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState ) override
{
- tools::verifyArgs(xBitmap, viewState, renderState,
+ canvastools::verifyArgs(xBitmap, viewState, renderState,
__func__,
static_cast< UnambiguousBaseType* >(this));
diff --git a/canvas/inc/base/canvascustomspritebase.hxx
b/canvas/inc/base/canvascustomspritebase.hxx
index 8379a54d935b..0d05219ffd6f 100644
--- a/canvas/inc/base/canvascustomspritebase.hxx
+++ b/canvas/inc/base/canvascustomspritebase.hxx
@@ -116,7 +116,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState ) override
{
- tools::verifyArgs(xBitmap, viewState, renderState,
+ canvastools::verifyArgs(xBitmap, viewState, renderState,
__func__,
static_cast< typename
BaseType::UnambiguousBaseType* >(this));
@@ -140,7 +140,7 @@ namespace canvas
// XSprite
virtual void SAL_CALL setAlpha( double alpha ) override
{
- tools::verifyRange( alpha, 0.0, 1.0 );
+ canvastools::verifyRange( alpha, 0.0, 1.0 );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -151,7 +151,7 @@ namespace canvas
const css::rendering::ViewState&
viewState,
const css::rendering::RenderState&
renderState ) override
{
- tools::verifyArgs(aNewPos, viewState, renderState,
+ canvastools::verifyArgs(aNewPos, viewState, renderState,
__func__,
static_cast< typename
BaseType::UnambiguousBaseType* >(this));
@@ -162,7 +162,7 @@ namespace canvas
virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D&
aTransformation ) override
{
- tools::verifyArgs(aTransformation,
+ canvastools::verifyArgs(aTransformation,
__func__,
static_cast< typename
BaseType::UnambiguousBaseType* >(this));
diff --git a/canvas/inc/base/graphicdevicebase.hxx
b/canvas/inc/base/graphicdevicebase.hxx
index 03aec9a85203..1610ac9f7dbe 100644
--- a/canvas/inc/base/graphicdevicebase.hxx
+++ b/canvas/inc/base/graphicdevicebase.hxx
@@ -184,7 +184,7 @@ namespace canvas
virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL
createCompatibleBitmap( const css::geometry::IntegerSize2D& size ) override
{
- tools::verifyBitmapSize(size,
+ canvastools::verifyBitmapSize(size,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -195,7 +195,7 @@ namespace canvas
virtual css::uno::Reference< css::rendering::XVolatileBitmap >
SAL_CALL createVolatileBitmap( const css::geometry::IntegerSize2D& size )
override
{
- tools::verifyBitmapSize(size,
+ canvastools::verifyBitmapSize(size,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -206,7 +206,7 @@ namespace canvas
virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL
createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size ) override
{
- tools::verifyBitmapSize(size,
+ canvastools::verifyBitmapSize(size,
__func__,
static_cast< UnambiguousBaseType* >(this));
@@ -217,7 +217,7 @@ namespace canvas
virtual css::uno::Reference< css::rendering::XVolatileBitmap >
SAL_CALL createVolatileAlphaBitmap( const css::geometry::IntegerSize2D& size )
override
{
- tools::verifyBitmapSize(size,
+ canvastools::verifyBitmapSize(size,
__func__,
static_cast< UnambiguousBaseType* >(this));
diff --git a/canvas/inc/base/integerbitmapbase.hxx
b/canvas/inc/base/integerbitmapbase.hxx
index 43c4401c5ac5..f38b9ced32b5 100644
--- a/canvas/inc/base/integerbitmapbase.hxx
+++ b/canvas/inc/base/integerbitmapbase.hxx
@@ -43,10 +43,10 @@ namespace canvas
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getData(
css::rendering::IntegerBitmapLayout& bitmapLayout,
const css::geometry::IntegerRectangle2D& rect ) override
{
- tools::verifyArgs(rect,
+ canvastools::verifyArgs(rect,
__func__,
static_cast< typename Base::UnambiguousBaseType*
>(this));
- tools::verifyIndexRange(rect, Base::getSize() );
+ canvastools::verifyIndexRange(rect, Base::getSize() );
typename Base::MutexType aGuard( Base::m_aMutex );
@@ -58,10 +58,10 @@ namespace canvas
const
css::rendering::IntegerBitmapLayout& bitmapLayout,
const
css::geometry::IntegerRectangle2D& rect ) override
{
- tools::verifyArgs(bitmapLayout, rect,
+ canvastools::verifyArgs(bitmapLayout, rect,
__func__,
static_cast< typename Base::UnambiguousBaseType*
>(this));
- tools::verifyIndexRange(rect, Base::getSize() );
+ canvastools::verifyIndexRange(rect, Base::getSize() );
typename Base::MutexType aGuard( Base::m_aMutex );
@@ -72,10 +72,10 @@ namespace canvas
const
css::rendering::IntegerBitmapLayout& bitmapLayout,
const css::geometry::IntegerPoint2D&
pos ) override
{
- tools::verifyArgs(bitmapLayout, pos,
+ canvastools::verifyArgs(bitmapLayout, pos,
__func__,
static_cast< typename Base::UnambiguousBaseType*
>(this));
- tools::verifyIndexRange(pos, Base::getSize() );
+ canvastools::verifyIndexRange(pos, Base::getSize() );
typename Base::MutexType aGuard( Base::m_aMutex );
@@ -85,10 +85,10 @@ namespace canvas
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getPixel(
css::rendering::IntegerBitmapLayout& bitmapLayout,
const
css::geometry::IntegerPoint2D& pos ) override
{
- tools::verifyArgs(pos,
+ canvastools::verifyArgs(pos,
__func__,
static_cast< typename Base::UnambiguousBaseType*
>(this));
- tools::verifyIndexRange(pos, Base::getSize() );
+ canvastools::verifyIndexRange(pos, Base::getSize() );
typename Base::MutexType aGuard( Base::m_aMutex );
diff --git a/canvas/inc/base/spritecanvasbase.hxx
b/canvas/inc/base/spritecanvasbase.hxx
index 0a0d952a2955..0af4f913851e 100644
--- a/canvas/inc/base/spritecanvasbase.hxx
+++ b/canvas/inc/base/spritecanvasbase.hxx
@@ -94,7 +94,7 @@ namespace canvas
// XSpriteCanvas
virtual css::uno::Reference< css::rendering::XAnimatedSprite >
SAL_CALL createSpriteFromAnimation( const css::uno::Reference<
css::rendering::XAnimation >& animation ) override
{
- tools::verifyArgs(animation,
+ canvastools::verifyArgs(animation,
__func__,
static_cast< typename
BaseType::UnambiguousBaseType* >(this));
@@ -106,10 +106,10 @@ namespace canvas
virtual css::uno::Reference< css::rendering::XAnimatedSprite >
SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence<
css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps,
sal_Int8
interpolationMode ) override
{
- tools::verifyArgs(animationBitmaps,
+ canvastools::verifyArgs(animationBitmaps,
__func__,
static_cast< typename
BaseType::UnambiguousBaseType* >(this));
- tools::verifyRange( interpolationMode,
+ canvastools::verifyRange( interpolationMode,
css::rendering::InterpolationMode::NEAREST_NEIGHBOR,
css::rendering::InterpolationMode::BEZIERSPLINE4 );
@@ -120,7 +120,7 @@ namespace canvas
virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL
createCustomSprite( const css::geometry::RealSize2D& spriteSize ) override
{
- tools::verifySpriteSize(spriteSize,
+ canvastools::verifySpriteSize(spriteSize,
__func__,
static_cast< typename
BaseType::UnambiguousBaseType* >(this));
@@ -131,7 +131,7 @@ namespace canvas
virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL
createClonedSprite( const css::uno::Reference< css::rendering::XSprite >&
original ) override
{
- tools::verifyArgs(original,
+ canvastools::verifyArgs(original,
__func__,
static_cast< typename
BaseType::UnambiguousBaseType* >(this));
diff --git a/canvas/inc/propertysethelper.hxx b/canvas/inc/propertysethelper.hxx
index 754a35009a9d..428c3e1ddd67 100644
--- a/canvas/inc/propertysethelper.hxx
+++ b/canvas/inc/propertysethelper.hxx
@@ -58,7 +58,7 @@ namespace canvas
GetterType getter;
SetterType setter;
};
- typedef tools::ValueMap< Callbacks > MapType;
+ typedef canvastools::ValueMap< Callbacks > MapType;
typedef std::vector< MapType::MapEntry > InputMap;
class MakeMap : public InputMap
diff --git a/canvas/inc/verifyinput.hxx b/canvas/inc/verifyinput.hxx
index 7dd956c92882..f973abe276f4 100644
--- a/canvas/inc/verifyinput.hxx
+++ b/canvas/inc/verifyinput.hxx
@@ -49,10 +49,8 @@ namespace com::sun::star::rendering
namespace com::sun::star::uno { template <class E> class Sequence; }
-namespace canvas
+namespace canvastools
{
- namespace tools
- {
// Input checking facilities
@@ -567,7 +565,6 @@ namespace canvas
CANVASTOOLS_DLLPUBLIC void verifySpriteSize( const
css::geometry::RealSize2D& size,
const char*
pStr,
const css::uno::Reference< css::uno::XInterface
>& xIf );
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx
b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index 72fb291ebf35..7d1c3c6f501c 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx
@@ -39,13 +39,13 @@ namespace cairocanvas
CanvasCustomSprite::CanvasCustomSprite( const css::geometry::RealSize2D&
rSpriteSize,
const SpriteCanvasRef&
rRefDevice ) :
mpSpriteCanvas( rRefDevice ),
- maSize( ::canvas::tools::roundUp( rSpriteSize.Width ),
- ::canvas::tools::roundUp( rSpriteSize.Height ) )
+ maSize( ::canvastools::roundUp( rSpriteSize.Width ),
+ ::canvastools::roundUp( rSpriteSize.Height ) )
{
ENSURE_OR_THROW( rRefDevice,
"CanvasCustomSprite::CanvasCustomSprite(): Invalid
sprite canvas" );
- SAL_INFO( "canvas.cairo", "sprite size: " << ::canvas::tools::roundUp(
rSpriteSize.Width ) << ", " << ::canvas::tools::roundUp( rSpriteSize.Height ));
+ SAL_INFO( "canvas.cairo", "sprite size: " << ::canvastools::roundUp(
rSpriteSize.Width ) << ", " << ::canvastools::roundUp( rSpriteSize.Height ));
mpBufferSurface = mpSpriteCanvas->createSurface( maSize,
CAIRO_CONTENT_COLOR_ALPHA );
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx
b/canvas/source/cairo/cairo_canvasfont.cxx
index a2650811b721..e5448c933616 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@@ -48,7 +48,7 @@ namespace cairocanvas
mpRefDevice(std::move( rDevice )),
mnEmphasisMark(0)
{
- ::canvas::tools::extractExtraFontProperties(rExtraFontProperties,
mnEmphasisMark);
+ ::canvastools::extractExtraFontProperties(rExtraFontProperties,
mnEmphasisMark);
maFont->SetAlignment( ALIGN_BASELINE );
maFont->SetCharSet(
(rFontRequest.FontDescription.IsSymbolFont==css::util::TriState_YES) ?
RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 58a3798deeff..e957d4d6460f 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1279,8 +1279,8 @@ constexpr OUStringLiteral
PARAMETRICPOLYPOLYGON_IMPLEMENTATION_NAME = u"Canvas::
if( mpCairo )
{
- return uno::Reference< rendering::XBitmap >( new CanvasBitmap(
::basegfx::B2ISize( ::canvas::tools::roundUp( newSize.Width ),
-
::canvas::tools::roundUp( newSize.Height ) ),
+ return uno::Reference< rendering::XBitmap >( new CanvasBitmap(
::basegfx::B2ISize( ::canvastools::roundUp( newSize.Width ),
+
::canvastools::roundUp( newSize.Height ) ),
mpSurfaceProvider, mpDevice, false ) );
}
else
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx
b/canvas/source/cairo/cairo_canvashelper_text.cxx
index c8498bddf3b7..8fa086830f85 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -65,7 +65,7 @@ namespace cairocanvas
{
::basegfx::B2DHomMatrix aMatrix;
- ::canvas::tools::mergeViewAndRenderTransform(aMatrix,
+ ::canvastools::mergeViewAndRenderTransform(aMatrix,
rViewState,
rRenderState);
@@ -114,7 +114,7 @@ namespace cairocanvas
const rendering::ViewState& viewState,
const rendering::RenderState& renderState )
{
- ::canvas::tools::verifyInput( renderState,
+ ::canvastools::verifyInput( renderState,
__func__,
const_cast<rendering::XCanvas*>(pOwner),
// only for refcount
2,
@@ -122,7 +122,7 @@ namespace cairocanvas
// TODO(P2): Don't change clipping all the time, maintain current clip
// state and change only when update is necessary
- ::canvas::tools::clipOutDev(viewState, renderState, rOutDev);
+ ::canvastools::clipOutDev(viewState, renderState, rOutDev);
Color aColor( COL_WHITE );
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx
b/canvas/source/cairo/cairo_devicehelper.cxx
index 6e86b836591a..5c586ea34e52 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -111,7 +111,7 @@ namespace cairocanvas
geometry::RealSize2D DeviceHelper::getPhysicalSize()
{
if( !mpRefDevice )
- return ::canvas::tools::createInfiniteSize2D(); // we're disposed
+ return ::canvastools::createInfiniteSize2D(); // we're disposed
// Map the pixel dimensions of the output window to millimeter
const MapMode aOldMapMode( mpRefDevice->GetMapMode() );
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx
b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index 45a594545663..4bbb02590179 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -259,9 +259,9 @@ namespace cairocanvas
// would copy pixel that are not supposed to be part of
// the sprite.
::basegfx::B2IRange aSourceRect(
- ::canvas::tools::spritePixelAreaFromB2DRange( rMoveStart ) );
+ ::canvastools::spritePixelAreaFromB2DRange( rMoveStart ) );
const ::basegfx::B2IRange aDestRect(
- ::canvas::tools::spritePixelAreaFromB2DRange( rMoveEnd ) );
+ ::canvastools::spritePixelAreaFromB2DRange( rMoveEnd ) );
::basegfx::B2IPoint aDestPos( aDestRect.getMinimum() );
std::vector< ::basegfx::B2IRange > aUnscrollableAreas;
@@ -272,7 +272,7 @@ namespace cairocanvas
// clip to output bounds (cannot properly scroll stuff
// _outside_ our screen area)
- if( !::canvas::tools::clipScrollArea( aSourceRect,
+ if( !::canvastools::clipScrollArea( aSourceRect,
aDestPos,
aUnscrollableAreas,
aOutputBounds ) )
@@ -445,9 +445,9 @@ namespace cairocanvas
// device's area.
const Size aOutputSize(
std::min( rSize.getWidth(),
- ::canvas::tools::roundUp( rRequestedArea.getMaxX() -
aOutputPosition.X()) ),
+ ::canvastools::roundUp( rRequestedArea.getMaxX() -
aOutputPosition.X()) ),
std::min( rSize.getHeight(),
- ::canvas::tools::roundUp( rRequestedArea.getMaxY() -
aOutputPosition.Y()) ) );
+ ::canvastools::roundUp( rRequestedArea.getMaxY() -
aOutputPosition.Y()) ) );
cairo_rectangle( pCompositingCairo.get(), aOutputPosition.X(),
aOutputPosition.Y(), aOutputSize.Width(), aOutputSize.Height() );
cairo_clip( pCompositingCairo.get() );
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index e6b81999ef8f..fa64a49d70f3 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
-e
... etc. - the rest is truncated
