diff options
Diffstat (limited to 'canvas/source')
52 files changed, 96 insertions, 96 deletions
diff --git a/canvas/source/cairo/cairo_cachedbitmap.hxx b/canvas/source/cairo/cairo_cachedbitmap.hxx index e3dd9856bc17..bc406638dd57 100644 --- a/canvas/source/cairo/cairo_cachedbitmap.hxx +++ b/canvas/source/cairo/cairo_cachedbitmap.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX -#include <canvas/base/cachedprimitivebase.hxx> +#include <base/cachedprimitivebase.hxx> #include <com/sun/star/rendering/RenderState.hpp> #include <vcl/cairo.hxx> diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 934b9edccd63..b576da8542fc 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -31,10 +31,10 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/bitmapcanvasbase.hxx> -#include <canvas/base/graphicdevicebase.hxx> -#include <canvas/base/integerbitmapbase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/bitmapcanvasbase.hxx> +#include <base/graphicdevicebase.hxx> +#include <base/integerbitmapbase.hxx> #include "cairo_canvashelper.hxx" #include "cairo_devicehelper.hxx" diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index 2c6f788d078a..54cda90789fb 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -28,9 +28,9 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <comphelper/uno3.hxx> -#include <canvas/base/bitmapcanvasbase.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/integerbitmapbase.hxx> +#include <base/bitmapcanvasbase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/integerbitmapbase.hxx> #include "cairo_canvashelper.hxx" #include "cairo_repainttarget.hxx" diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index 16ff0c105c7c..300f016464d8 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx @@ -30,8 +30,8 @@ #include <basegfx/point/b2dpoint.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/canvascustomspritebase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/canvascustomspritebase.hxx> #include <vcl/cairo.hxx> diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx index f35f6f455d11..59fca1286c3f 100644 --- a/canvas/source/cairo/cairo_canvasfont.hxx +++ b/canvas/source/cairo/cairo_canvasfont.hxx @@ -30,7 +30,7 @@ #include <vcl/font.hxx> -#include <canvas/vclwrapper.hxx> +#include <vclwrapper.hxx> #include "cairo_surfaceprovider.hxx" diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index d3c36b47649e..b53c6eed2904 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -50,7 +50,7 @@ #include <vcl/virdev.hxx> #include <canvas/canvastools.hxx> -#include <canvas/parametricpolypolygon.hxx> +#include <parametricpolypolygon.hxx> #include <cairo.h> #include "cairo_cachedbitmap.hxx" diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 386c922f4397..e86d6aadc132 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -28,7 +28,7 @@ #include <vcl/virdev.hxx> #include <canvas/canvastools.hxx> -#include <canvas/verifyinput.hxx> +#include <verifyinput.hxx> #include <cairo.h> #include "cairo_canvasfont.hxx" diff --git a/canvas/source/cairo/cairo_sprite.hxx b/canvas/source/cairo/cairo_sprite.hxx index e5ea93d0ce05..446b2a59ea7c 100644 --- a/canvas/source/cairo/cairo_sprite.hxx +++ b/canvas/source/cairo/cairo_sprite.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITE_HXX #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITE_HXX -#include <canvas/base/sprite.hxx> +#include <base/sprite.hxx> #include <vcl/cairo.hxx> diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 1ea4d14f233e..42765643fabe 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -33,10 +33,10 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/spritecanvasbase.hxx> -#include <canvas/base/spritesurface.hxx> -#include <canvas/base/disambiguationhelper.hxx> -#include <canvas/base/bufferedgraphicdevicebase.hxx> +#include <base/spritecanvasbase.hxx> +#include <base/spritesurface.hxx> +#include <base/disambiguationhelper.hxx> +#include <base/bufferedgraphicdevicebase.hxx> #include "cairo_spritedevicehelper.hxx" #include "cairo_repainttarget.hxx" diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx index e8ebb515bb4c..6d659afd00c2 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.hxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/rendering/XAnimation.hpp> #include <com/sun/star/rendering/XCustomSprite.hpp> -#include <canvas/spriteredrawmanager.hxx> +#include <spriteredrawmanager.hxx> #include <vcl/cairo.hxx> #include "cairo_canvashelper.hxx" diff --git a/canvas/source/cairo/cairo_spritehelper.hxx b/canvas/source/cairo/cairo_spritehelper.hxx index ceacd3e3168e..84bf77dbc90f 100644 --- a/canvas/source/cairo/cairo_spritehelper.hxx +++ b/canvas/source/cairo/cairo_spritehelper.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX -#include <canvas/base/canvascustomspritehelper.hxx> +#include <base/canvascustomspritehelper.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 511e90e9d6e2..834deb89eb2b 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -38,9 +38,9 @@ #include <canvas/elapsedtime.hxx> #include <canvas/canvastools.hxx> -#include <canvas/rendering/icolorbuffer.hxx> -#include <canvas/rendering/irendermodule.hxx> -#include <canvas/rendering/isurface.hxx> +#include <rendering/icolorbuffer.hxx> +#include <rendering/irendermodule.hxx> +#include <rendering/isurface.hxx> #include "dx_config.hxx" #include "dx_impltools.hxx" diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 210723ca2a4b..4db2b16a5d25 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -34,11 +34,11 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/integerbitmapbase.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/graphicdevicebase.hxx> -#include <canvas/base/canvasbase.hxx> -#include <canvas/base/bitmapcanvasbase.hxx> +#include <base/integerbitmapbase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/graphicdevicebase.hxx> +#include <base/canvasbase.hxx> +#include <base/bitmapcanvasbase.hxx> #include "dx_bitmapprovider.hxx" #include "dx_canvashelper.hxx" diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index d7031aaa4eb2..756791d1526d 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -26,9 +26,9 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <basegfx/vector/b2isize.hxx> #include <cppuhelper/compbase.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/bitmapcanvasbase.hxx> -#include <canvas/base/integerbitmapbase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/bitmapcanvasbase.hxx> +#include <base/integerbitmapbase.hxx> #include "dx_bitmapprovider.hxx" #include "dx_bitmapcanvashelper.hxx" diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index 1772741a3fdf..53886f636db3 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -33,8 +33,8 @@ #include <basegfx/vector/b2isize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/canvascustomspritebase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/canvascustomspritebase.hxx> #include "dx_sprite.hxx" #include "dx_surfacebitmap.hxx" diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx index 504987c64f9a..f60dffb3b870 100644 --- a/canvas/source/directx/dx_canvashelper_texturefill.cxx +++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx @@ -36,7 +36,7 @@ #include <rtl/math.hxx> #include <tools/diagnose_ex.h> -#include <canvas/parametricpolypolygon.hxx> +#include <parametricpolypolygon.hxx> #include "dx_canvashelper.hxx" #include "dx_impltools.hxx" diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx index 51d46f29af97..ac52c127a0d5 100644 --- a/canvas/source/directx/dx_devicehelper.hxx +++ b/canvas/source/directx/dx_devicehelper.hxx @@ -27,7 +27,7 @@ #include "dx_rendermodule.hxx" #include "dx_bitmap.hxx" -#include <canvas/rendering/isurfaceproxymanager.hxx> +#include <rendering/isurfaceproxymanager.hxx> #include <vcl/vclptr.hxx> class OutputDevice; diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx index 6d7f54e4713b..18113ee34394 100644 --- a/canvas/source/directx/dx_impltools.cxx +++ b/canvas/source/directx/dx_impltools.cxx @@ -38,7 +38,7 @@ #include <tools/diagnose_ex.h> #include <canvas/canvastools.hxx> -#include <canvas/verifyinput.hxx> +#include <verifyinput.hxx> #include "dx_canvas.hxx" #include "dx_canvasbitmap.hxx" diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx index b4863953a4c3..0ab154182543 100644 --- a/canvas/source/directx/dx_rendermodule.hxx +++ b/canvas/source/directx/dx_rendermodule.hxx @@ -22,7 +22,7 @@ #include <basegfx/vector/b2ivector.hxx> #include <basegfx/range/b2irectangle.hxx> -#include <canvas/rendering/irendermodule.hxx> +#include <rendering/irendermodule.hxx> #include <memory> #include "dx_winstuff.hxx" diff --git a/canvas/source/directx/dx_sprite.hxx b/canvas/source/directx/dx_sprite.hxx index 680a75f7decf..82c43fbde8b9 100644 --- a/canvas/source/directx/dx_sprite.hxx +++ b/canvas/source/directx/dx_sprite.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITE_HXX #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITE_HXX -#include <canvas/base/sprite.hxx> +#include <base/sprite.hxx> namespace dxcanvas { diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index bef5f5c15f73..22832bccef89 100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx @@ -36,10 +36,10 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/spritecanvasbase.hxx> -#include <canvas/base/spritesurface.hxx> -#include <canvas/base/disambiguationhelper.hxx> -#include <canvas/base/bufferedgraphicdevicebase.hxx> +#include <base/spritecanvasbase.hxx> +#include <base/spritesurface.hxx> +#include <base/disambiguationhelper.hxx> +#include <base/bufferedgraphicdevicebase.hxx> #include "dx_bitmapprovider.hxx" #include "dx_spritecanvashelper.hxx" diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx index 5137d6f9f208..9e99489cd75a 100644 --- a/canvas/source/directx/dx_spritecanvashelper.hxx +++ b/canvas/source/directx/dx_spritecanvashelper.hxx @@ -23,9 +23,9 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> -#include <canvas/spriteredrawmanager.hxx> -#include <canvas/rendering/isurfaceproxy.hxx> -#include <canvas/rendering/isurfaceproxymanager.hxx> +#include <spriteredrawmanager.hxx> +#include <rendering/isurfaceproxy.hxx> +#include <rendering/isurfaceproxymanager.hxx> #include "dx_bitmapcanvashelper.hxx" #include "dx_impltools.hxx" diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx index 88848d4bf0ce..1e77a66fca97 100644 --- a/canvas/source/directx/dx_spritedevicehelper.hxx +++ b/canvas/source/directx/dx_spritedevicehelper.hxx @@ -28,7 +28,7 @@ #include "dx_surfacebitmap.hxx" #include "dx_devicehelper.hxx" -#include <canvas/rendering/isurfaceproxymanager.hxx> +#include <rendering/isurfaceproxymanager.hxx> namespace dxcanvas diff --git a/canvas/source/directx/dx_spritehelper.hxx b/canvas/source/directx/dx_spritehelper.hxx index c1fb66e01794..bc559c60127b 100644 --- a/canvas/source/directx/dx_spritehelper.hxx +++ b/canvas/source/directx/dx_spritehelper.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/rendering/XCustomSprite.hpp> -#include <canvas/base/canvascustomspritehelper.hxx> +#include <base/canvascustomspritehelper.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2isize.hxx> diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx index 7ca1596bcc96..52c83de26829 100644 --- a/canvas/source/directx/dx_surfacebitmap.cxx +++ b/canvas/source/directx/dx_surfacebitmap.cxx @@ -27,7 +27,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2irange.hxx> #include <tools/diagnose_ex.h> -#include <canvas/rendering/icolorbuffer.hxx> +#include <rendering/icolorbuffer.hxx> #include "dx_graphicsprovider.hxx" #include "dx_impltools.hxx" diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx index 87d6dcbfe647..75cd630c6b6a 100644 --- a/canvas/source/directx/dx_surfacebitmap.hxx +++ b/canvas/source/directx/dx_surfacebitmap.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX -#include <canvas/rendering/isurfaceproxy.hxx> -#include <canvas/rendering/isurfaceproxymanager.hxx> +#include <rendering/isurfaceproxy.hxx> +#include <rendering/isurfaceproxymanager.hxx> #include "dx_ibitmap.hxx" #include "dx_canvasfont.hxx" #include "dx_gdiplususer.hxx" diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx index fa7b8de20af6..72ac619c5b60 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.hxx +++ b/canvas/source/opengl/ogl_canvasbitmap.hxx @@ -15,9 +15,9 @@ #include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> -#include <canvas/base/integerbitmapbase.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/bitmapcanvasbase.hxx> +#include <base/integerbitmapbase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/bitmapcanvasbase.hxx> #include "ogl_bitmapcanvashelper.hxx" #include "ogl_spritecanvas.hxx" diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index bfcc3c95f84f..c7ca59b28291 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -16,7 +16,7 @@ #include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/utils/canvastools.hxx> #include <canvas/canvastools.hxx> -#include <canvas/verifyinput.hxx> +#include <verifyinput.hxx> #include <tools/diagnose_ex.h> #include "ogl_canvascustomsprite.hxx" diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx index 2f603af40d11..0f0a7693c00b 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.hxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx @@ -17,7 +17,7 @@ #include <basegfx/point/b2dpoint.hxx> -#include <canvas/base/basemutexhelper.hxx> +#include <base/basemutexhelper.hxx> #include "ogl_spritecanvas.hxx" #include "ogl_canvashelper.hxx" diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index d7635cda6ca5..245575b863e7 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -24,9 +24,9 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/canvasbase.hxx> -#include <canvas/base/disambiguationhelper.hxx> -#include <canvas/base/bufferedgraphicdevicebase.hxx> +#include <base/canvasbase.hxx> +#include <base/disambiguationhelper.hxx> +#include <base/bufferedgraphicdevicebase.hxx> #include "ogl_spritedevicehelper.hxx" #include "ogl_canvashelper.hxx" diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index dac4dd08768d..056796fcde98 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/rendering/RepaintResult.hpp> #include <cppuhelper/supportsservice.hxx> -#include <canvas/base/cachedprimitivebase.hxx> +#include <base/cachedprimitivebase.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 52134658b41f..e98ecf4b27ed 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -32,7 +32,7 @@ #include <rtl/math.hxx> #include <tools/diagnose_ex.h> -#include <canvas/base/canvascustomspritehelper.hxx> +#include <base/canvascustomspritehelper.hxx> #include <canvas/canvastools.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx index 800a294a9433..cfb3cbd9d4bd 100644 --- a/canvas/source/tools/page.hxx +++ b/canvas/source/tools/page.hxx @@ -22,9 +22,9 @@ #include <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irectangle.hxx> -#include <canvas/rendering/icolorbuffer.hxx> -#include <canvas/rendering/irendermodule.hxx> -#include <canvas/rendering/isurface.hxx> +#include <rendering/icolorbuffer.hxx> +#include <rendering/irendermodule.hxx> +#include <rendering/isurface.hxx> #include <memory> #include <vector> diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx index a811a10f3a62..761c84c33cf6 100644 --- a/canvas/source/tools/pagemanager.hxx +++ b/canvas/source/tools/pagemanager.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CANVAS_SOURCE_TOOLS_PAGEMANAGER_HXX #include <basegfx/vector/b2isize.hxx> -#include <canvas/rendering/irendermodule.hxx> +#include <rendering/irendermodule.hxx> #include "page.hxx" diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 1da3960a2f06..5bbd50576f2e 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/rendering/XGraphicDevice.hpp> -#include <canvas/parametricpolypolygon.hxx> +#include <parametricpolypolygon.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx index d44f4cea12ad..e7880fe4bd83 100644 --- a/canvas/source/tools/propertysethelper.cxx +++ b/canvas/source/tools/propertysethelper.cxx @@ -19,7 +19,7 @@ #include <sal/config.h> -#include <canvas/propertysethelper.hxx> +#include <propertysethelper.hxx> #include <com/sun/star/beans/PropertyVetoException.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index 1307acea0372..110eb5540e73 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -26,7 +26,7 @@ #include <tools/diagnose_ex.h> #include <sal/log.hxx> -#include <canvas/spriteredrawmanager.hxx> +#include <spriteredrawmanager.hxx> #include <boost/range/adaptor/reversed.hpp> namespace canvas diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx index 66d4fe3120c4..e791e6b5050d 100644 --- a/canvas/source/tools/surface.hxx +++ b/canvas/source/tools/surface.hxx @@ -26,7 +26,7 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/vector/b2isize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <canvas/rendering/icolorbuffer.hxx> +#include <rendering/icolorbuffer.hxx> #include "pagemanager.hxx" diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx index 09cd36d7f6b0..fb9308a61bc5 100644 --- a/canvas/source/tools/surfaceproxy.hxx +++ b/canvas/source/tools/surfaceproxy.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_CANVAS_SOURCE_TOOLS_SURFACEPROXY_HXX #define INCLUDED_CANVAS_SOURCE_TOOLS_SURFACEPROXY_HXX -#include <canvas/rendering/isurfaceproxy.hxx> -#include <canvas/rendering/icolorbuffer.hxx> +#include <rendering/isurfaceproxy.hxx> +#include <rendering/icolorbuffer.hxx> #include "pagemanager.hxx" #include "surface.hxx" diff --git a/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx index 87aa953cf213..b60c5ecb485b 100644 --- a/canvas/source/tools/surfaceproxymanager.cxx +++ b/canvas/source/tools/surfaceproxymanager.cxx @@ -19,8 +19,8 @@ #include <sal/config.h> -#include <canvas/rendering/isurfaceproxy.hxx> -#include <canvas/rendering/isurfaceproxymanager.hxx> +#include <rendering/isurfaceproxy.hxx> +#include <rendering/isurfaceproxymanager.hxx> #include "surfaceproxy.hxx" diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index 052d8bbfb723..16fc3f8d6a10 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/rendering/ViewState.hpp> #include <com/sun/star/util/Endianness.hpp> -#include <canvas/verifyinput.hxx> +#include <verifyinput.hxx> using namespace ::com::sun::star; diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx index 6f147b79756c..fd2e45f5143a 100644 --- a/canvas/source/vcl/bitmapbackbuffer.hxx +++ b/canvas/source/vcl/bitmapbackbuffer.hxx @@ -23,7 +23,7 @@ #include <vcl/virdev.hxx> #include <vcl/bitmapex.hxx> -#include <canvas/vclwrapper.hxx> +#include <vclwrapper.hxx> #include "outdevprovider.hxx" #include <memory> diff --git a/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx index c96e24bb31b7..f76b2c3fc59e 100644 --- a/canvas/source/vcl/cachedbitmap.hxx +++ b/canvas/source/vcl/cachedbitmap.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX #include <com/sun/star/rendering/RenderState.hpp> -#include <canvas/base/cachedprimitivebase.hxx> +#include <base/cachedprimitivebase.hxx> #include <vcl/GraphicObject.hxx> #include <memory> diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index db9e7c4b9f8c..6a3c66b00d75 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -31,10 +31,10 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/bitmapcanvasbase.hxx> -#include <canvas/base/integerbitmapbase.hxx> -#include <canvas/base/graphicdevicebase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/bitmapcanvasbase.hxx> +#include <base/integerbitmapbase.hxx> +#include <base/graphicdevicebase.hxx> #include "canvashelper.hxx" #include "impltools.hxx" diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 934044b59beb..ee8ae6b45f41 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -29,9 +29,9 @@ #include <vcl/bitmapex.hxx> -#include <canvas/base/bitmapcanvasbase.hxx> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/integerbitmapbase.hxx> +#include <base/bitmapcanvasbase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/integerbitmapbase.hxx> #include "canvasbitmaphelper.hxx" #include "impltools.hxx" diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 91de9c253cd0..675699a333e2 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -28,9 +28,9 @@ #include <com/sun/star/rendering/XCustomSprite.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> -#include <canvas/base/basemutexhelper.hxx> -#include <canvas/base/spritesurface.hxx> -#include <canvas/base/canvascustomspritebase.hxx> +#include <base/basemutexhelper.hxx> +#include <base/spritesurface.hxx> +#include <base/canvascustomspritebase.hxx> #include "sprite.hxx" #include "canvashelper.hxx" diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index 70d546171a41..f9cd2d6d29f3 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -31,7 +31,7 @@ #include <vcl/font.hxx> -#include <canvas/vclwrapper.hxx> +#include <vclwrapper.hxx> #include "outdevprovider.hxx" diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index bd17a8883d21..646cef28aac6 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -40,7 +40,7 @@ #include <vcl/virdev.hxx> #include <canvas/canvastools.hxx> -#include <canvas/parametricpolypolygon.hxx> +#include <parametricpolypolygon.hxx> #include "canvashelper.hxx" #include "impltools.hxx" diff --git a/canvas/source/vcl/sprite.hxx b/canvas/source/vcl/sprite.hxx index c7de3575169b..3d29041d9916 100644 --- a/canvas/source/vcl/sprite.hxx +++ b/canvas/source/vcl/sprite.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITE_HXX #define INCLUDED_CANVAS_SOURCE_VCL_SPRITE_HXX -#include <canvas/base/sprite.hxx> +#include <base/sprite.hxx> class OutputDevice; diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index 7681835df2a4..fcca957dbc5c 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -35,10 +35,10 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/spritecanvasbase.hxx> -#include <canvas/base/spritesurface.hxx> -#include <canvas/base/disambiguationhelper.hxx> -#include <canvas/base/bufferedgraphicdevicebase.hxx> +#include <base/spritecanvasbase.hxx> +#include <base/spritesurface.hxx> +#include <base/disambiguationhelper.hxx> +#include <base/bufferedgraphicdevicebase.hxx> #include "spritecanvashelper.hxx" #include "impltools.hxx" diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx index f32c5f955fdf..b7553e367c5d 100644 --- a/canvas/source/vcl/spritecanvashelper.hxx +++ b/canvas/source/vcl/spritecanvashelper.hxx @@ -27,7 +27,7 @@ #include <vcl/vclptr.hxx> #include <vcl/virdev.hxx> -#include <canvas/spriteredrawmanager.hxx> +#include <spriteredrawmanager.hxx> #include <canvas/elapsedtime.hxx> #include "canvashelper.hxx" diff --git a/canvas/source/vcl/spritehelper.hxx b/canvas/source/vcl/spritehelper.hxx index d25bdc4166f3..1599fe40717e 100644 --- a/canvas/source/vcl/spritehelper.hxx +++ b/canvas/source/vcl/spritehelper.hxx @@ -22,9 +22,9 @@ #include <vcl/bitmapex.hxx> -#include <canvas/base/canvascustomspritehelper.hxx> -#include <canvas/base/spritesurface.hxx> -#include <canvas/vclwrapper.hxx> +#include <base/canvascustomspritehelper.hxx> +#include <base/spritesurface.hxx> +#include <vclwrapper.hxx> #include "backbuffer.hxx" |