canvas/source/vcl/canvasbitmap.hxx | 5 canvas/source/vcl/canvasbitmaphelper.hxx | 1 canvas/source/vcl/spritecanvas.hxx | 4 drawinglayer/source/processor2d/processor2dtools.cxx | 2 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2 drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx | 2 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 2 drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 include/drawinglayer/processor2d/vclpixelprocessor2d.hxx | 2 sd/source/ui/presenter/PresenterCanvas.hxx | 24 ++ sd/source/ui/slideshow/slideshowviewimpl.hxx | 3 slideshow/Library_slideshow.mk | 6 slideshow/source/engine/shapes/viewbackgroundshape.cxx | 26 ++ slideshow/source/engine/shapes/viewshape.cxx | 126 ++++++++----- slideshow/source/engine/slideview.cxx | 40 +++- vcl/Library_vcl.mk | 1 vcl/inc/canvas_inc/base/bitmapcanvasbase.hxx | 2 vcl/inc/canvas_inc/base/bufferedgraphicdevicebase.hxx | 2 vcl/inc/canvas_inc/base/canvasbase.hxx | 2 vcl/inc/canvas_inc/base/canvascustomspritebase.hxx | 6 vcl/inc/canvas_inc/base/canvascustomspritehelper.hxx | 2 vcl/inc/canvas_inc/base/graphicdevicebase.hxx | 6 vcl/inc/canvas_inc/base/integerbitmapbase.hxx | 2 vcl/inc/canvas_inc/base/spritecanvasbase.hxx | 6 vcl/inc/canvas_inc/base/spritesurface.hxx | 2 vcl/inc/canvas_inc/cairo_cachedbitmap.hxx | 2 vcl/inc/canvas_inc/cairo_canvas.hxx | 8 vcl/inc/canvas_inc/cairo_canvasbitmap.hxx | 12 - vcl/inc/canvas_inc/cairo_canvascustomsprite.hxx | 14 - vcl/inc/canvas_inc/cairo_canvasfont.hxx | 2 vcl/inc/canvas_inc/cairo_sprite.hxx | 2 vcl/inc/canvas_inc/cairo_spritecanvas.hxx | 10 - vcl/inc/canvas_inc/cairo_spritecanvashelper.hxx | 2 vcl/inc/canvas_inc/cairo_spritehelper.hxx | 2 vcl/source/canvas/cairo/cairo_cachedbitmap.cxx | 4 vcl/source/canvas/cairo/cairo_canvas.cxx | 2 vcl/source/canvas/cairo/cairo_canvasbitmap.cxx | 4 vcl/source/canvas/cairo/cairo_canvascustomsprite.cxx | 4 vcl/source/canvas/cairo/cairo_canvasfont.cxx | 4 vcl/source/canvas/cairo/cairo_canvashelper.cxx | 10 - vcl/source/canvas/cairo/cairo_canvashelper_text.cxx | 8 vcl/source/canvas/cairo/cairo_devicehelper.cxx | 4 vcl/source/canvas/cairo/cairo_spritecanvas.cxx | 2 vcl/source/canvas/cairo/cairo_spritecanvashelper.cxx | 4 vcl/source/canvas/cairo/cairo_spritedevicehelper.cxx | 4 vcl/source/canvas/cairo/cairo_spritehelper.cxx | 4 vcl/source/canvas/cairo/cairo_textlayout.cxx | 2 vcl/source/canvas/tools/cachedprimitivebase.cxx | 2 vcl/source/canvas/tools/canvascustomspritehelper.cxx | 2 vcl/source/canvas/tools/page.hxx | 6 vcl/source/canvas/tools/pagemanager.hxx | 2 vcl/source/canvas/tools/parametricpolypolygon.cxx | 2 vcl/source/canvas/tools/propertysethelper.cxx | 2 vcl/source/canvas/tools/spriteredrawmanager.cxx | 2 vcl/source/canvas/tools/surface.hxx | 2 vcl/source/canvas/tools/surfaceproxy.hxx | 4 vcl/source/canvas/tools/surfaceproxymanager.cxx | 4 vcl/source/canvas/tools/verifyinput.cxx | 2 vcl/source/window/window.cxx | 2 59 files changed, 267 insertions(+), 153 deletions(-)
New commits: commit 986ca61003ab13d4feb31333447dbc5bc5f26040 Author: Shardul Vikram Singh <[email protected]> AuthorDate: Thu Sep 25 19:03:54 2025 +0530 Commit: Shardul Vikram Singh <[email protected]> CommitDate: Thu Sep 25 19:27:56 2025 +0530 Add primitives support for vclcanvas Change-Id: Iec1230b77cfe18bef6a99274e4a98f5336199b2a diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 1a95ce8c632c..4dc8d5017ed1 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -105,6 +105,11 @@ namespace vclcanvas // 3rd the pixmap depth virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {} + BitmapBackBufferSharedPtr const & getBackBuffer() const { return maCanvasHelper.getBackBuffer(); } + OutputDevice& getOutDev() + { + return getBackBuffer()->getOutDev(); + } private: /** MUST hold here, too, since CanvasHelper only contains a diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx index 7e75f92e82d6..59707fbfda57 100644 --- a/canvas/source/vcl/canvasbitmaphelper.hxx +++ b/canvas/source/vcl/canvasbitmaphelper.hxx @@ -95,6 +95,7 @@ namespace vclcanvas /// @internal BitmapEx getBitmap() const; + const BitmapBackBufferSharedPtr& getBackBuffer() const { return mpBackBuffer; } private: diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index 8f7c76880f51..a3cc646ad524 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -109,6 +109,10 @@ namespace vclcanvas css::uno::XComponentContext >& rxContext ); void initialize(); + OutputDevice* getOutDev() + { + return &getBackBuffer()->getOutDev(); + } /// For resource tracking virtual ~SpriteCanvas() override; diff --git a/drawinglayer/source/processor2d/processor2dtools.cxx b/drawinglayer/source/processor2d/processor2dtools.cxx index 6c38abc4039d..e3e3083b49b5 100644 --- a/drawinglayer/source/processor2d/processor2dtools.cxx +++ b/drawinglayer/source/processor2d/processor2dtools.cxx @@ -18,7 +18,7 @@ */ #include <drawinglayer/processor2d/processor2dtools.hxx> #include <vcl/gdimtf.hxx> -#include "vclpixelprocessor2d.hxx" +#include <drawinglayer/processor2d/vclpixelprocessor2d.hxx> #include "vclmetafileprocessor2d.hxx" #include <config_vclplug.h> diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 80436df8cbdd..ac2053b2ce75 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -20,7 +20,7 @@ #include <cmath> #include <memory> #include "vclmetafileprocessor2d.hxx" -#include "vclpixelprocessor2d.hxx" +#include <drawinglayer/processor2d/vclpixelprocessor2d.hxx> #include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <tools/stream.hxx> diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx index 46d1cb2f1edf..1f0a2b7abbd4 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx @@ -21,7 +21,7 @@ #include <stack> -#include "vclprocessor2d.hxx" +#include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <vcl/pdfextoutdevdata.hxx> // vcl::PDFExtOutDevData support diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 3264cdfc2a4a..05c1b822421f 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "vclpixelprocessor2d.hxx" +#include <drawinglayer/processor2d/vclpixelprocessor2d.hxx> #include "vclhelperbufferdevice.hxx" #include <comphelper/lok.hxx> diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index da2d667db513..fcb259a18730 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "vclprocessor2d.hxx" +#include <drawinglayer/processor2d/vclprocessor2d.hxx> #include "getdigitlanguage.hxx" #include "vclhelperbufferdevice.hxx" diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx similarity index 97% rename from drawinglayer/source/processor2d/vclpixelprocessor2d.hxx rename to include/drawinglayer/processor2d/vclpixelprocessor2d.hxx index 2c582c3347bc..7639a4278bbf 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx +++ b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer::processor2d all fed primitives to a VCL Window. It is the currently used renderer for all VCL editing output from the DrawingLayer. */ -class VclPixelProcessor2D final : public VclProcessor2D +class UNLESS_MERGELIBS(DRAWINGLAYER_DLLPUBLIC) VclPixelProcessor2D final : public VclProcessor2D { AntialiasingFlags m_nOrigAntiAliasing; diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx b/include/drawinglayer/processor2d/vclprocessor2d.hxx similarity index 100% rename from drawinglayer/source/processor2d/vclprocessor2d.hxx rename to include/drawinglayer/processor2d/vclprocessor2d.hxx diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index da2f51a7990f..65df7e911a3e 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -19,6 +19,8 @@ #pragma once +#include "com/sun/star/lang/XServiceInfo.hdl" +#include "cppuhelper/supportsservice.hxx" #include <basegfx/range/b2drectangle.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/XWindowListener.hpp> @@ -36,7 +38,8 @@ namespace sd::presenter { typedef comphelper::WeakComponentImplHelper < css::rendering::XSpriteCanvas, css::rendering::XBitmap, - css::awt::XWindowListener + css::awt::XWindowListener, + css::lang::XServiceInfo > PresenterCanvasInterfaceBase; /** Wrapper around a shared canvas that forwards most of its methods to the @@ -95,6 +98,7 @@ public: virtual void disposing(std::unique_lock<std::mutex>&) override; css::awt::Point GetOffset (const css::uno::Reference<css::awt::XWindow>& rxBaseWindow); + css::awt::Point GetOffset() { return maOffset; } /** Merge the given view state with the view state that translates the (virtual) child canvas to the shared canvas. @@ -112,6 +116,21 @@ public: css::uno::Reference<css::rendering::XPolyPolygon2D> UpdateSpriteClip ( const css::uno::Reference<css::rendering::XPolyPolygon2D>& rxOriginalClip, const css::geometry::RealPoint2D& rLocation); + // XServiceInfo + OUString SAL_CALL getImplementationName( ) override + { + return u"PresenterCanvas"_ustr; + } + + sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override + { + return cppu::supportsService( this, ServiceName ); + } + + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override + { + return { u"com.sun.star.rendering.CanvasBitmap"_ustr }; + } // XCanvas @@ -275,9 +294,8 @@ public: virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& rNewSize, sal_Bool bFast) override; - -private: css::uno::Reference<css::rendering::XSpriteCanvas> mxUpdateCanvas; +private: css::uno::Reference<css::awt::XWindow> mxUpdateWindow; css::uno::Reference<css::rendering::XCanvas> mxSharedCanvas; css::uno::Reference<css::awt::XWindow> mxSharedWindow; diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index fb266c80debb..65f97fbbae78 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -16,6 +16,7 @@ $(eval $(call gb_Library_set_include,slideshow,\ -I$(SRCDIR)/sd/inc \ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/source/ui/slideshow \ + -I$(SRCDIR)/sd/source/ui/presenter \ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/canvas/source/ \ -I$(SRCDIR)/canvas/inc \ diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 38ea9373a7a9..77cc3f74b0fd 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -40,12 +40,15 @@ #include <cppcanvas/basegfxfactory.hxx> #include "viewshape.hxx" +#include "PresenterCanvas.hxx" #include "basegfx/point/b2dpoint.hxx" #include "com/sun/star/uno/Reference.h" #include "drawinglayer/geometry/viewinformation2d.hxx" #include "drawinglayer/primitive2d/Primitive2DContainer.hxx" #include "drawinglayer/processor2d/cairopixelprocessor2d.hxx" +#include "drawinglayer/processor2d/vclpixelprocessor2d.hxx" #include "sal/types.h" +#include "vcl/canvasbitmap.hxx" #include "vcl/outdev.hxx" #include "canvas_inc/cairo_canvasbitmap.hxx" #include "canvas_inc/cairo_canvascustomsprite.hxx" @@ -53,6 +56,7 @@ #include "cairo/cairo_canvasbitmap.hxx" #include "cairo/cairo_canvascustomsprite.hxx" #include "cairo/cairo_spritecanvas.hxx" +#include "vcl/spritecanvas.hxx" #include "vcl_canvas/customsprite.hxx" #include "vcl_canvas/spritecanvas.hxx" #include <basegfx/utils/canvastools.hxx> @@ -875,8 +879,11 @@ namespace slideshow::internal void ViewShape::leaveAnimationMode() { - mpCustomSprite->hide(); - mpCustomSprite.reset(); + if (mpCustomSprite) + { + mpCustomSprite->hide(); + mpCustomSprite.reset(); + } mbAnimationMode = false; mbForceUpdate = true; } @@ -922,22 +929,71 @@ namespace slideshow::internal return true; if (!bIsVisible) return true; + + drawinglayer::geometry::ViewInformation2D aViewInormation; + aViewInormation.setViewTime(rArgs.mnElapsedTime*1000); + basegfx::B2DHomMatrix aMatrix(mpViewLayer->getTransformation()); + // Original Position of center of shape wrt origin + basegfx::B2DPoint aOrigCenterPos(rArgs.maOrigBounds.getCenter()); + aOrigCenterPos *= mpViewLayer->getSpriteTransformation(); + // Current Position of center of shape wrt origin + basegfx::B2DPoint aCurrCenterPos(rArgs.maBounds.getCenter()); + aCurrCenterPos *= mpViewLayer->getSpriteTransformation(); + // Bring the shape to the current Position + aMatrix.translate(-aOrigCenterPos + aCurrCenterPos); + aViewInormation.setViewTransformation(aMatrix); + uno::Reference<css::lang::XServiceInfo> xInfo( mpViewLayer->getCanvas()->getUNOCanvas(), uno::UNO_QUERY); cairo::SurfaceSharedPtr pSurface; - if (!xInfo.is() || xInfo->getImplementationName().indexOf("VCLCanvas") != -1) + + if (!xInfo.is()) + { + return true; + } + if (xInfo->getImplementationName().indexOf("VCLCanvas.CanvasBitmap") != -1) { - // return render( mpViewLayer->getCanvas(), - // rMtf, - // rArgs.maBounds, - // rArgs.maUpdateBounds, - // nUpdateFlags, - // rArgs.mrAttr, - // rArgs.mrSubsets, - // bIsVisible ); + /* return render( mpViewLayer->getCanvas(), + rMtf, + rArgs.maBounds, + rArgs.maUpdateBounds, + nUpdateFlags, + rArgs.mrAttr, + rArgs.mrSubsets, + bIsVisible ); */ + vclcanvas::CanvasBitmap* pCanvasBitmap + = static_cast<vclcanvas::CanvasBitmap*>( + mpViewLayer->getCanvas()->getUNOCanvas().get()); + OutputDevice& rOutDev = pCanvasBitmap->getOutDev(); + drawinglayer::processor2d::VclPixelProcessor2D aProcessor(aViewInormation, rOutDev); + aProcessor.process(rContainer); + return true; + } + else if(xInfo->getImplementationName().indexOf("SpriteCanvas.VCL") != -1) + { + vclcanvas::SpriteCanvas* pSpriteCanvas = static_cast<vclcanvas::SpriteCanvas*>( + mpViewLayer->getCanvas()->getUNOCanvas().get()); + OutputDevice& rOutDev = *pSpriteCanvas->getOutDev(); + drawinglayer::processor2d::VclPixelProcessor2D aProcessor(aViewInormation, rOutDev); + aProcessor.process(rContainer); return true; } - if (xInfo->getImplementationName().indexOf("SpriteCanvas") != -1) + else if(xInfo->getImplementationName().indexOf("PresenterCanvas") != -1) + { + sd::presenter::PresenterCanvas* pPresentationCanvas + = static_cast<sd::presenter::PresenterCanvas*>( + mpViewLayer->getCanvas()->getUNOCanvas().get()); + vclcanvas::SpriteCanvas* pSpriteCanvas = static_cast<vclcanvas::SpriteCanvas*>( + pPresentationCanvas->mxUpdateCanvas.get()); + OutputDevice& rOutDev = *pSpriteCanvas->getOutDev(); + auto aOffset = pPresentationCanvas->GetOffset(); + aMatrix.translate(::basegfx::B2DPoint(aOffset.X, aOffset.Y)); + aViewInormation.setViewTransformation(aMatrix); + drawinglayer::processor2d::VclPixelProcessor2D aProcessor(aViewInormation, rOutDev); + aProcessor.process(rContainer); + return true; + } + else if (xInfo->getImplementationName().indexOf("SpriteCanvas") != -1) { // SpriteCanvas vcl_canvas::SpriteCanvasSharedPtr pSpriteCanvasAbstract @@ -963,18 +1019,6 @@ namespace slideshow::internal mpViewLayer->getCanvas()->getUNOCanvas().get()); pSurface = pCanvasBitmap->getSurface(); } - drawinglayer::geometry::ViewInformation2D aViewInormation; - aViewInormation.setViewTime(rArgs.mnElapsedTime*1000); - basegfx::B2DHomMatrix aMatrix(mpViewLayer->getTransformation()); - // Original Position of center of shape wrt origin - basegfx::B2DPoint aOrigCenterPos(rArgs.maOrigBounds.getCenter()); - aOrigCenterPos *= mpViewLayer->getSpriteTransformation(); - // Current Position of center of shape wrt origin - basegfx::B2DPoint aCurrCenterPos(rArgs.maBounds.getCenter()); - aCurrCenterPos *= mpViewLayer->getSpriteTransformation(); - // Bring the shape to the current Position - aMatrix.translate(-aOrigCenterPos + aCurrCenterPos); - aViewInormation.setViewTransformation(aMatrix); drawinglayer::processor2d::CairoPixelProcessor2D aProcessor( aViewInormation, pSurface->getCairoSurface().get()); aProcessor.process(rContainer); diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index bf6473964ce1..63d73ac3b479 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -849,8 +849,7 @@ bool SlideView::updateScreen() const } else { - return true; - // return mpCanvas->updateScreen(false); + return mpCanvas->updateScreen(false); } } @@ -867,8 +866,7 @@ bool SlideView::paintScreen() const } else { - return true; - // return mpCanvas->updateScreen(true); + return mpCanvas->updateScreen(true); } } commit b2cda0a07e447651428af9db7a39c7b0cf6cf261 Author: Shardul Vikram Singh <[email protected]> AuthorDate: Thu Sep 25 13:50:59 2025 +0530 Commit: Shardul Vikram Singh <[email protected]> CommitDate: Thu Sep 25 15:53:50 2025 +0530 Fix SlideView::clearAll and clear function Change-Id: Ic84fdd566b72fb0e71c764484432c64ed8c4c4e8 diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 6469cf69d3f1..38ea9373a7a9 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -373,6 +373,11 @@ namespace slideshow::internal rSpriteSizePixel, nPrio ); */ vcl_canvas::SpriteCanvasSharedPtr pSpriteCanvasAbstract = mpViewLayer->getSpriteCanvas(); + if(!pSpriteCanvasAbstract) + { + // PresenterSlideShowView uses vclcanvas + return true; + } auto xSpriteSizePixel = ::basegfx::unotools::size2DFromB2DSize(rSpriteSizePixel); mpCustomSprite = pSpriteCanvasAbstract->createCustomSprite(xSpriteSizePixel); } diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 9581fbaa6de7..bf6473964ce1 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -876,7 +876,10 @@ void SlideView::clear() const { osl::MutexGuard aGuard( m_aMutex ); - getSpriteCanvas()->clear(); + if (auto ptr = getSpriteCanvas()) + { + ptr->clear(); + } OSL_ENSURE( mxView.is() && mpCanvas, "SlideView::clear(): Disposed" ); if( !mxView.is() || !mpCanvas ) @@ -895,7 +898,10 @@ void SlideView::clearAll() const { osl::MutexGuard aGuard( m_aMutex ); - // getSpriteCanvas()->clear(); + if (auto ptr = getSpriteCanvas()) + { + ptr->clear(); + } OSL_ENSURE( mxView.is() && mpCanvas, "SlideView::clear(): Disposed" ); if( !mxView.is() || !mpCanvas ) commit 11d89f81d10a1c8178d17638d94d0b71bba9d01f Author: Shardul Vikram Singh <[email protected]> AuthorDate: Thu Sep 25 01:06:37 2025 +0530 Commit: Shardul Vikram Singh <[email protected]> CommitDate: Thu Sep 25 01:06:37 2025 +0530 Fix some segmentation faults Change-Id: I3c8f0da905da2db26c2472b98d2582cc53ef1744 diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 07f9abd77e94..f6571f016e82 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -19,6 +19,7 @@ #pragma once +#include "sal/types.h" #include <comphelper/compbase.hxx> #include <comphelper/interfacecontainer4.hxx> #include <com/sun/star/awt/XWindowListener.hpp> @@ -98,7 +99,7 @@ typedef comphelper::WeakComponentImplHelper< css::presentation::XSlideShowView, css::awt::XMouseListener, css::awt::XMouseMotionListener > SlideShowView_Base; -class SlideShowView final : public SlideShowView_Base +class SAL_DLLPUBLIC_EXPORT SlideShowView final : public SlideShowView_Base { public: SlideShowView( ShowWindow& rOutputWindow, diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 7cd01080df49..fb266c80debb 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ editeng \ sal \ salhelper \ + sd \ svl \ svt \ svxcore \ diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index fb0981f3db84..4e812838e999 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -183,12 +183,26 @@ namespace slideshow::internal TOOLS_WARN_EXCEPTION( "slideshow", "" ); return false; } + uno::Reference<css::lang::XServiceInfo> xInfo( + mpViewLayer->getCanvas()->getUNOCanvas(), uno::UNO_QUERY); cairo::SurfaceSharedPtr pSurface; - vcl_canvas::SpriteCanvasSharedPtr pSpriteCanvasAbstract - = mpViewLayer->getSpriteCanvas(); - std::shared_ptr<::vcl_cairocanvas::SpriteCanvas> pSpriteCanvas - = std::static_pointer_cast<::vcl_cairocanvas::SpriteCanvas>(pSpriteCanvasAbstract); - pSurface = pSpriteCanvas->getSurface(); + if (!xInfo.is()) + { + return true; + } + else if (xInfo->getImplementationName().indexOf("SpriteCanvas") != -1) + { + vcl_canvas::SpriteCanvasSharedPtr pSpriteCanvasAbstract + = mpViewLayer->getSpriteCanvas(); + std::shared_ptr<::vcl_cairocanvas::SpriteCanvas> pSpriteCanvas + = std::static_pointer_cast<::vcl_cairocanvas::SpriteCanvas>( + pSpriteCanvasAbstract); + pSurface = pSpriteCanvas->getSurface(); + } + else + { + return true; + } basegfx::B2DHomMatrix aMatrix(mpViewLayer->getTransformation()); drawinglayer::geometry::ViewInformation2D aViewInormation; aViewInormation.setViewTransformation(aMatrix); diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 2136e8b9d872..6469cf69d3f1 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -41,15 +41,18 @@ #include "viewshape.hxx" #include "basegfx/point/b2dpoint.hxx" -#include "canvas_inc/cairo_canvasbitmap.hxx" -#include "canvas_inc/cairo_canvascustomsprite.hxx" -#include "canvas_inc/cairo_spritecanvas.hxx" #include "com/sun/star/uno/Reference.h" #include "drawinglayer/geometry/viewinformation2d.hxx" #include "drawinglayer/primitive2d/Primitive2DContainer.hxx" #include "drawinglayer/processor2d/cairopixelprocessor2d.hxx" #include "sal/types.h" #include "vcl/outdev.hxx" +#include "canvas_inc/cairo_canvasbitmap.hxx" +#include "canvas_inc/cairo_canvascustomsprite.hxx" +#include "canvas_inc/cairo_spritecanvas.hxx" +#include "cairo/cairo_canvasbitmap.hxx" +#include "cairo/cairo_canvascustomsprite.hxx" +#include "cairo/cairo_spritecanvas.hxx" #include "vcl_canvas/customsprite.hxx" #include "vcl_canvas/spritecanvas.hxx" #include <basegfx/utils/canvastools.hxx> @@ -914,10 +917,10 @@ namespace slideshow::internal return true; if (!bIsVisible) return true; - /* uno::Reference<css::lang::XServiceInfo> xInfo( - mpViewLayer->getCanvas()->getUNOCanvas(), uno::UNO_QUERY); */ + uno::Reference<css::lang::XServiceInfo> xInfo( + mpViewLayer->getCanvas()->getUNOCanvas(), uno::UNO_QUERY); cairo::SurfaceSharedPtr pSurface; - /* if (!xInfo.is() || xInfo->getImplementationName().indexOf("VCLCanvas") != -1) + if (!xInfo.is() || xInfo->getImplementationName().indexOf("VCLCanvas") != -1) { // return render( mpViewLayer->getCanvas(), // rMtf, @@ -932,9 +935,11 @@ namespace slideshow::internal if (xInfo->getImplementationName().indexOf("SpriteCanvas") != -1) { // SpriteCanvas - cairocanvas::SpriteCanvas* pSpriteCanvas - = static_cast<cairocanvas::SpriteCanvas*>( - mpViewLayer->getCanvas()->getUNOCanvas().get()); + vcl_canvas::SpriteCanvasSharedPtr pSpriteCanvasAbstract + = mpViewLayer->getSpriteCanvas(); + std::shared_ptr<::vcl_cairocanvas::SpriteCanvas> pSpriteCanvas + = std::static_pointer_cast<::vcl_cairocanvas::SpriteCanvas>( + pSpriteCanvasAbstract); pSurface = pSpriteCanvas->getSurface(); } else if (xInfo->getImplementationName().indexOf("CanvasCustomSprite") != -1) @@ -952,12 +957,7 @@ namespace slideshow::internal = static_cast<cairocanvas::CanvasBitmap*>( mpViewLayer->getCanvas()->getUNOCanvas().get()); pSurface = pCanvasBitmap->getSurface(); - } */ - vcl_canvas::SpriteCanvasSharedPtr pSpriteCanvasAbstract = mpViewLayer->getSpriteCanvas(); - std::shared_ptr<::vcl_cairocanvas::SpriteCanvas> pSpriteCanvas - = std::static_pointer_cast<::vcl_cairocanvas::SpriteCanvas>( - pSpriteCanvasAbstract); - pSurface = pSpriteCanvas->getSurface(); + } drawinglayer::geometry::ViewInformation2D aViewInormation; aViewInormation.setViewTime(rArgs.mnElapsedTime*1000); basegfx::B2DHomMatrix aMatrix(mpViewLayer->getTransformation()); diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 53c20428fc00..9581fbaa6de7 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/log.hxx" #include "vcl_canvas/spritecanvas.hxx" #include "slideshowviewimpl.hxx" #include <comphelper/diagnose_ex.hxx> @@ -842,8 +843,15 @@ bool SlideView::updateScreen() const ENSURE_OR_RETURN_FALSE( mpCanvas, "SlideView::updateScreen(): Disposed" ); - return getSpriteCanvas()->updateScreen(false); - // return mpCanvas->updateScreen( false ); + if (auto ptr = getSpriteCanvas()) + { + return ptr->updateScreen(false); + } + else + { + return true; + // return mpCanvas->updateScreen(false); + } } bool SlideView::paintScreen() const @@ -853,8 +861,15 @@ bool SlideView::paintScreen() const ENSURE_OR_RETURN_FALSE( mpCanvas, "SlideView::paintScreen(): Disposed" ); - return getSpriteCanvas()->updateScreen(true); - // return mpCanvas->updateScreen( true ); + if (auto ptr = getSpriteCanvas()) + { + return ptr->updateScreen(true); + } + else + { + return true; + // return mpCanvas->updateScreen(true); + } } void SlideView::clear() const @@ -880,7 +895,7 @@ void SlideView::clearAll() const { osl::MutexGuard aGuard( m_aMutex ); - getSpriteCanvas()->clear(); + // getSpriteCanvas()->clear(); OSL_ENSURE( mxView.is() && mpCanvas, "SlideView::clear(): Disposed" ); if( !mxView.is() || !mpCanvas ) @@ -928,9 +943,12 @@ cppcanvas::CanvasSharedPtr SlideView::getCanvas() const vcl_canvas::SpriteCanvasSharedPtr SlideView::getSpriteCanvas() const { - rtl::Reference< sd::SlideShowView > pImpl = static_cast< sd::SlideShowView* >( mxView.get() ); - return pImpl->getSpriteCanvas(); - // return vcl_canvas::SpriteCanvasSharedPtr(); + rtl::Reference< sd::SlideShowView > pImpl = dynamic_cast< sd::SlideShowView* >( mxView.get() ); + if(!pImpl) + { + return nullptr; + } + return pImpl->getSpriteCanvas();; } cppcanvas::CustomSpriteSharedPtr SlideView::createSprite( commit 0eb4c027b9696367055fda75e712553fa39a413e Author: Shardul Vikram Singh <[email protected]> AuthorDate: Sat Aug 30 17:09:13 2025 +0530 Commit: Shardul Vikram Singh <[email protected]> CommitDate: Sat Aug 30 17:09:13 2025 +0530 Move vcl/canvas_inc in vcl/inc/ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index accd9a5ca0b5..7cd01080df49 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -16,8 +16,8 @@ $(eval $(call gb_Library_set_include,slideshow,\ -I$(SRCDIR)/sd/inc \ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/source/ui/slideshow \ - -I$(SRCDIR)/vcl/canvas_inc \ - -I$(SRCDIR)/canvas/source/cairo \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/canvas/source/ \ -I$(SRCDIR)/canvas/inc \ -I$(SRCDIR)/svx/inc \ )) diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index fd74b7dc3467..fb0981f3db84 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -23,7 +23,7 @@ #include <sal/log.hxx> #include "viewbackgroundshape.hxx" -#include "cairo_spritecanvas.hxx" +#include "canvas_inc/cairo_spritecanvas.hxx" #include "drawinglayer/processor2d/cairopixelprocessor2d.hxx" #include <tools.hxx> diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 6dd0ef5a4edb..2136e8b9d872 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -18,7 +18,6 @@ */ #include <cairo.h> -#include <cairo_spritecanvas.hxx> #include <memory> #include <sal/config.h> @@ -42,9 +41,9 @@ #include "viewshape.hxx" #include "basegfx/point/b2dpoint.hxx" -#include "cairo_canvasbitmap.hxx" -#include "cairo_canvascustomsprite.hxx" -#include "cairo_spritecanvas.hxx" +#include "canvas_inc/cairo_canvasbitmap.hxx" +#include "canvas_inc/cairo_canvascustomsprite.hxx" +#include "canvas_inc/cairo_spritecanvas.hxx" #include "com/sun/star/uno/Reference.h" #include "drawinglayer/geometry/viewinformation2d.hxx" #include "drawinglayer/primitive2d/Primitive2DContainer.hxx" diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b55f90161360..31147857a0d5 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_precompiled_header,vcl,vcl/inc/pch/precompiled_vcl) $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/vcl/canvas_inc \ )) $(eval $(call gb_Library_add_defs,vcl,\ diff --git a/vcl/canvas_inc/base/basemutexhelper.hxx b/vcl/inc/canvas_inc/base/basemutexhelper.hxx similarity index 100% rename from vcl/canvas_inc/base/basemutexhelper.hxx rename to vcl/inc/canvas_inc/base/basemutexhelper.hxx diff --git a/vcl/canvas_inc/base/bitmapcanvasbase.hxx b/vcl/inc/canvas_inc/base/bitmapcanvasbase.hxx similarity index 99% rename from vcl/canvas_inc/base/bitmapcanvasbase.hxx rename to vcl/inc/canvas_inc/base/bitmapcanvasbase.hxx index d6e51bf7ceb2..1b30e3806daa 100644 --- a/vcl/canvas_inc/base/bitmapcanvasbase.hxx +++ b/vcl/inc/canvas_inc/base/bitmapcanvasbase.hxx @@ -19,7 +19,7 @@ #pragma once -#include <base/canvasbase.hxx> +#include <canvas_inc/base/canvasbase.hxx> #include <com/sun/star/geometry/IntegerSize2D.hpp> namespace com::sun::star::rendering { class XBitmapCanvas; } diff --git a/vcl/canvas_inc/base/bufferedgraphicdevicebase.hxx b/vcl/inc/canvas_inc/base/bufferedgraphicdevicebase.hxx similarity index 99% rename from vcl/canvas_inc/base/bufferedgraphicdevicebase.hxx rename to vcl/inc/canvas_inc/base/bufferedgraphicdevicebase.hxx index a31e61e06098..f319049611b5 100644 --- a/vcl/canvas_inc/base/bufferedgraphicdevicebase.hxx +++ b/vcl/inc/canvas_inc/base/bufferedgraphicdevicebase.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <vcl_canvas/canvastools.hxx> -#include <base/graphicdevicebase.hxx> +#include <canvas_inc/base/graphicdevicebase.hxx> namespace com::sun::star::awt { class XTopWindow; } diff --git a/vcl/canvas_inc/base/cachedprimitivebase.hxx b/vcl/inc/canvas_inc/base/cachedprimitivebase.hxx similarity index 100% rename from vcl/canvas_inc/base/cachedprimitivebase.hxx rename to vcl/inc/canvas_inc/base/cachedprimitivebase.hxx diff --git a/vcl/canvas_inc/base/canvasbase.hxx b/vcl/inc/canvas_inc/base/canvasbase.hxx similarity index 99% rename from vcl/canvas_inc/base/canvasbase.hxx rename to vcl/inc/canvas_inc/base/canvasbase.hxx index 614b9b659917..224d061fa5da 100644 --- a/vcl/canvas_inc/base/canvasbase.hxx +++ b/vcl/inc/canvas_inc/base/canvasbase.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/rendering/TextDirection.hpp> #include <osl/mutex.hxx> -#include <verifyinput.hxx> +#include <canvas_inc/verifyinput.hxx> namespace com::sun::star::beans { struct PropertyValue; } namespace com::sun::star::geometry { class XMapping2D; } diff --git a/vcl/canvas_inc/base/canvascustomspritebase.hxx b/vcl/inc/canvas_inc/base/canvascustomspritebase.hxx similarity index 98% rename from vcl/canvas_inc/base/canvascustomspritebase.hxx rename to vcl/inc/canvas_inc/base/canvascustomspritebase.hxx index 6101d251da3a..3633fc7036c3 100644 --- a/vcl/canvas_inc/base/canvascustomspritebase.hxx +++ b/vcl/inc/canvas_inc/base/canvascustomspritebase.hxx @@ -25,9 +25,9 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/range/b2drange.hxx> -#include <base/integerbitmapbase.hxx> -#include <base/bitmapcanvasbase.hxx> -#include <base/sprite.hxx> +#include <canvas_inc/base/integerbitmapbase.hxx> +#include <canvas_inc/base/bitmapcanvasbase.hxx> +#include <canvas_inc/base/sprite.hxx> namespace com::sun::star::rendering { class XPolyPolygon2D; } diff --git a/vcl/canvas_inc/base/canvascustomspritehelper.hxx b/vcl/inc/canvas_inc/base/canvascustomspritehelper.hxx similarity index 99% rename from vcl/canvas_inc/base/canvascustomspritehelper.hxx rename to vcl/inc/canvas_inc/base/canvascustomspritehelper.hxx index 061fdd87068b..09933a507600 100644 --- a/vcl/canvas_inc/base/canvascustomspritehelper.hxx +++ b/vcl/inc/canvas_inc/base/canvascustomspritehelper.hxx @@ -24,7 +24,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/vector/b2dvector.hxx> -#include <base/spritesurface.hxx> +#include <canvas_inc/base/spritesurface.hxx> #include <vcl_canvas/canvastoolsdllapi.h> namespace com::sun::star::geometry { struct AffineMatrix2D; } diff --git a/vcl/canvas_inc/base/disambiguationhelper.hxx b/vcl/inc/canvas_inc/base/disambiguationhelper.hxx similarity index 100% rename from vcl/canvas_inc/base/disambiguationhelper.hxx rename to vcl/inc/canvas_inc/base/disambiguationhelper.hxx diff --git a/vcl/canvas_inc/base/graphicdevicebase.hxx b/vcl/inc/canvas_inc/base/graphicdevicebase.hxx similarity index 99% rename from vcl/canvas_inc/base/graphicdevicebase.hxx rename to vcl/inc/canvas_inc/base/graphicdevicebase.hxx index 077e51b08af9..d61b64468b92 100644 --- a/vcl/canvas_inc/base/graphicdevicebase.hxx +++ b/vcl/inc/canvas_inc/base/graphicdevicebase.hxx @@ -27,9 +27,9 @@ #include <rtl/ref.hxx> -#include <parametricpolypolygon.hxx> -#include <propertysethelper.hxx> -#include <verifyinput.hxx> +#include <canvas_inc/parametricpolypolygon.hxx> +#include <canvas_inc/propertysethelper.hxx> +#include <canvas_inc/verifyinput.hxx> namespace com::sun::star::beans { class XPropertySetInfo; } namespace com::sun::star::lang { class XMultiServiceFactory; } diff --git a/vcl/canvas_inc/base/integerbitmapbase.hxx b/vcl/inc/canvas_inc/base/integerbitmapbase.hxx similarity index 99% rename from vcl/canvas_inc/base/integerbitmapbase.hxx rename to vcl/inc/canvas_inc/base/integerbitmapbase.hxx index e58f531f7aee..1f880b1e320a 100644 --- a/vcl/canvas_inc/base/integerbitmapbase.hxx +++ b/vcl/inc/canvas_inc/base/integerbitmapbase.hxx @@ -20,7 +20,7 @@ #pragma once #include <com/sun/star/rendering/IntegerBitmapLayout.hpp> -#include <verifyinput.hxx> +#include <canvas_inc/verifyinput.hxx> namespace vcl_canvas diff --git a/vcl/canvas_inc/base/sprite.hxx b/vcl/inc/canvas_inc/base/sprite.hxx similarity index 100% rename from vcl/canvas_inc/base/sprite.hxx rename to vcl/inc/canvas_inc/base/sprite.hxx diff --git a/vcl/canvas_inc/base/spritecanvasbase.hxx b/vcl/inc/canvas_inc/base/spritecanvasbase.hxx similarity index 98% rename from vcl/canvas_inc/base/spritecanvasbase.hxx rename to vcl/inc/canvas_inc/base/spritecanvasbase.hxx index ca0f08137264..90cbc8b81a93 100644 --- a/vcl/canvas_inc/base/spritecanvasbase.hxx +++ b/vcl/inc/canvas_inc/base/spritecanvasbase.hxx @@ -22,9 +22,9 @@ #include "vcl_canvas/customsprite.hxx" #include <rtl/ref.hxx> #include <com/sun/star/rendering/InterpolationMode.hpp> -#include <base/integerbitmapbase.hxx> -#include <base/bitmapcanvasbase.hxx> -#include <spriteredrawmanager.hxx> +#include <canvas_inc/base/integerbitmapbase.hxx> +#include <canvas_inc/base/bitmapcanvasbase.hxx> +#include <canvas_inc/spriteredrawmanager.hxx> namespace com::sun::star::rendering { class XAnimation; } namespace com::sun::star::rendering { class XAnimatedSprite; } diff --git a/vcl/canvas_inc/base/spritesurface.hxx b/vcl/inc/canvas_inc/base/spritesurface.hxx similarity index 98% rename from vcl/canvas_inc/base/spritesurface.hxx rename to vcl/inc/canvas_inc/base/spritesurface.hxx index 8a6c28fe8a4e..19e285488d28 100644 --- a/vcl/canvas_inc/base/spritesurface.hxx +++ b/vcl/inc/canvas_inc/base/spritesurface.hxx @@ -19,7 +19,7 @@ #pragma once -#include <base/sprite.hxx> +#include <canvas_inc/base/sprite.hxx> #include <memory> namespace vcl_canvas diff --git a/vcl/canvas_inc/cairo_cachedbitmap.hxx b/vcl/inc/canvas_inc/cairo_cachedbitmap.hxx similarity index 97% rename from vcl/canvas_inc/cairo_cachedbitmap.hxx rename to vcl/inc/canvas_inc/cairo_cachedbitmap.hxx index ca418aa5853d..eabbb2129a46 100644 --- a/vcl/canvas_inc/cairo_cachedbitmap.hxx +++ b/vcl/inc/canvas_inc/cairo_cachedbitmap.hxx @@ -19,7 +19,7 @@ #pragma once -#include <base/cachedprimitivebase.hxx> +#include <canvas_inc/base/cachedprimitivebase.hxx> #include <com/sun/star/rendering/RenderState.hpp> #include <vcl/cairo.hxx> diff --git a/vcl/canvas_inc/cairo_canvas.hxx b/vcl/inc/canvas_inc/cairo_canvas.hxx similarity index 96% rename from vcl/canvas_inc/cairo_canvas.hxx rename to vcl/inc/canvas_inc/cairo_canvas.hxx index c6d2d52c988f..ee3fe7f07d5f 100644 --- a/vcl/canvas_inc/cairo_canvas.hxx +++ b/vcl/inc/canvas_inc/cairo_canvas.hxx @@ -31,10 +31,10 @@ #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> -#include <base/basemutexhelper.hxx> -#include <base/bitmapcanvasbase.hxx> -#include <base/graphicdevicebase.hxx> -#include <base/integerbitmapbase.hxx> +#include <canvas_inc/base/basemutexhelper.hxx> +#include <canvas_inc/base/bitmapcanvasbase.hxx> +#include <canvas_inc/base/graphicdevicebase.hxx> +#include <canvas_inc/base/integerbitmapbase.hxx> #include "cairo_canvashelper.hxx" #include "cairo_devicehelper.hxx" diff --git a/vcl/canvas_inc/cairo_canvasbitmap.hxx b/vcl/inc/canvas_inc/cairo_canvasbitmap.hxx similarity index 94% rename from vcl/canvas_inc/cairo_canvasbitmap.hxx rename to vcl/inc/canvas_inc/cairo_canvasbitmap.hxx index da3c6c8c70bf..0226d09033f6 100644 --- a/vcl/canvas_inc/cairo_canvasbitmap.hxx +++ b/vcl/inc/canvas_inc/cairo_canvasbitmap.hxx @@ -27,13 +27,13 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <comphelper/uno3.hxx> -#include <base/bitmapcanvasbase.hxx> -#include <base/basemutexhelper.hxx> -#include <base/integerbitmapbase.hxx> +#include <canvas_inc/base/bitmapcanvasbase.hxx> +#include <canvas_inc/base/basemutexhelper.hxx> +#include <canvas_inc/base/integerbitmapbase.hxx> -#include "cairo_canvashelper.hxx" -#include "cairo_repainttarget.hxx" -#include "cairo_surfaceprovider.hxx" +#include "canvas_inc/cairo_canvashelper.hxx" +#include "canvas_inc/cairo_repainttarget.hxx" +#include "canvas_inc/cairo_surfaceprovider.hxx" #include "vcl_canvas/graphicdevice.hxx" diff --git a/vcl/canvas_inc/cairo_canvascustomsprite.hxx b/vcl/inc/canvas_inc/cairo_canvascustomsprite.hxx similarity index 94% rename from vcl/canvas_inc/cairo_canvascustomsprite.hxx rename to vcl/inc/canvas_inc/cairo_canvascustomsprite.hxx index 8ab6cfb260df..b6a11f95f05a 100644 --- a/vcl/canvas_inc/cairo_canvascustomsprite.hxx +++ b/vcl/inc/canvas_inc/cairo_canvascustomsprite.hxx @@ -29,17 +29,17 @@ #include <basegfx/point/b2dpoint.hxx> -#include <base/basemutexhelper.hxx> -#include <base/canvascustomspritebase.hxx> +#include <canvas_inc/base/basemutexhelper.hxx> +#include <canvas_inc/base/canvascustomspritebase.hxx> #include <memory> #include <vcl/cairo.hxx> -#include "cairo_sprite.hxx" -#include "cairo_canvashelper.hxx" -#include "cairo_repainttarget.hxx" -#include "cairo_spritehelper.hxx" -#include "cairo_spritecanvas.hxx" +#include "canvas_inc/cairo_sprite.hxx" +#include "canvas_inc/cairo_canvashelper.hxx" +#include "canvas_inc/cairo_repainttarget.hxx" +#include "canvas_inc/cairo_spritehelper.hxx" +#include "canvas_inc/cairo_spritecanvas.hxx" #include "vcl_canvas/canvas.hxx" #include "vcl_canvas/customsprite.hxx" diff --git a/vcl/canvas_inc/cairo_canvasfont.hxx b/vcl/inc/canvas_inc/cairo_canvasfont.hxx similarity index 98% rename from vcl/canvas_inc/cairo_canvasfont.hxx rename to vcl/inc/canvas_inc/cairo_canvasfont.hxx index 61f9f1da739a..31704509ad47 100644 --- a/vcl/canvas_inc/cairo_canvasfont.hxx +++ b/vcl/inc/canvas_inc/cairo_canvasfont.hxx @@ -28,7 +28,7 @@ #include <vcl/font.hxx> -#include <vclwrapper.hxx> +#include <canvas_inc/vclwrapper.hxx> #include "cairo_surfaceprovider.hxx" diff --git a/vcl/canvas_inc/cairo_canvashelper.hxx b/vcl/inc/canvas_inc/cairo_canvashelper.hxx similarity index 100% rename from vcl/canvas_inc/cairo_canvashelper.hxx rename to vcl/inc/canvas_inc/cairo_canvashelper.hxx diff --git a/vcl/canvas_inc/cairo_devicehelper.hxx b/vcl/inc/canvas_inc/cairo_devicehelper.hxx similarity index 100% rename from vcl/canvas_inc/cairo_devicehelper.hxx rename to vcl/inc/canvas_inc/cairo_devicehelper.hxx diff --git a/vcl/canvas_inc/cairo_repainttarget.hxx b/vcl/inc/canvas_inc/cairo_repainttarget.hxx similarity index 100% rename from vcl/canvas_inc/cairo_repainttarget.hxx rename to vcl/inc/canvas_inc/cairo_repainttarget.hxx diff --git a/vcl/canvas_inc/cairo_sprite.hxx b/vcl/inc/canvas_inc/cairo_sprite.hxx similarity index 98% rename from vcl/canvas_inc/cairo_sprite.hxx rename to vcl/inc/canvas_inc/cairo_sprite.hxx index 8ccfb4b3381d..989297c4d01d 100644 --- a/vcl/canvas_inc/cairo_sprite.hxx +++ b/vcl/inc/canvas_inc/cairo_sprite.hxx @@ -19,7 +19,7 @@ #pragma once -#include <base/sprite.hxx> +#include <canvas_inc/base/sprite.hxx> #include <vcl/cairo.hxx> diff --git a/vcl/canvas_inc/cairo_spritecanvas.hxx b/vcl/inc/canvas_inc/cairo_spritecanvas.hxx similarity index 96% rename from vcl/canvas_inc/cairo_spritecanvas.hxx rename to vcl/inc/canvas_inc/cairo_spritecanvas.hxx index ac99ca349d70..3d274c2710c7 100644 --- a/vcl/canvas_inc/cairo_spritecanvas.hxx +++ b/vcl/inc/canvas_inc/cairo_spritecanvas.hxx @@ -29,15 +29,15 @@ #include <com/sun/star/uno/XComponentContext.hpp> -#include <base/spritecanvasbase.hxx> -#include <base/spritesurface.hxx> -#include <base/disambiguationhelper.hxx> -#include <base/bufferedgraphicdevicebase.hxx> +#include <canvas_inc/base/spritecanvasbase.hxx> +#include <canvas_inc/base/spritesurface.hxx> +#include <canvas_inc/base/disambiguationhelper.hxx> +#include <canvas_inc/base/bufferedgraphicdevicebase.hxx> #include "cairo_spritedevicehelper.hxx" #include "cairo_repainttarget.hxx" #include "cairo_surfaceprovider.hxx" -#include "cairo_spritecanvashelper.hxx" +#include "canvas_inc/cairo_spritecanvashelper.hxx" namespace vcl_cairocanvas { diff --git a/vcl/canvas_inc/cairo_spritecanvashelper.hxx b/vcl/inc/canvas_inc/cairo_spritecanvashelper.hxx similarity index 99% rename from vcl/canvas_inc/cairo_spritecanvashelper.hxx rename to vcl/inc/canvas_inc/cairo_spritecanvashelper.hxx index 53117c3dd03f..72840d1a9ff5 100644 --- a/vcl/canvas_inc/cairo_spritecanvashelper.hxx +++ b/vcl/inc/canvas_inc/cairo_spritecanvashelper.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/rendering/XAnimation.hpp> #include <com/sun/star/rendering/XCustomSprite.hpp> -#include <spriteredrawmanager.hxx> +#include <canvas_inc/spriteredrawmanager.hxx> #include <vcl/cairo.hxx> #include "cairo_canvashelper.hxx" diff --git a/vcl/canvas_inc/cairo_spritedevicehelper.hxx b/vcl/inc/canvas_inc/cairo_spritedevicehelper.hxx similarity index 100% rename from vcl/canvas_inc/cairo_spritedevicehelper.hxx rename to vcl/inc/canvas_inc/cairo_spritedevicehelper.hxx diff --git a/vcl/canvas_inc/cairo_spritehelper.hxx b/vcl/inc/canvas_inc/cairo_spritehelper.hxx similarity index 98% rename from vcl/canvas_inc/cairo_spritehelper.hxx rename to vcl/inc/canvas_inc/cairo_spritehelper.hxx index d4084c7dc6c5..3fc7514c854a 100644 --- a/vcl/canvas_inc/cairo_spritehelper.hxx +++ b/vcl/inc/canvas_inc/cairo_spritehelper.hxx @@ -19,7 +19,7 @@ #pragma once -#include <base/canvascustomspritehelper.hxx> +#include <canvas_inc/base/canvascustomspritehelper.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/vcl/canvas_inc/cairo_surfaceprovider.hxx b/vcl/inc/canvas_inc/cairo_surfaceprovider.hxx similarity index 100% rename from vcl/canvas_inc/cairo_surfaceprovider.hxx rename to vcl/inc/canvas_inc/cairo_surfaceprovider.hxx diff --git a/vcl/canvas_inc/cairo_textlayout.hxx b/vcl/inc/canvas_inc/cairo_textlayout.hxx similarity index 100% rename from vcl/canvas_inc/cairo_textlayout.hxx rename to vcl/inc/canvas_inc/cairo_textlayout.hxx diff --git a/vcl/canvas_inc/parametricpolypolygon.hxx b/vcl/inc/canvas_inc/parametricpolypolygon.hxx similarity index 100% rename from vcl/canvas_inc/parametricpolypolygon.hxx rename to vcl/inc/canvas_inc/parametricpolypolygon.hxx diff --git a/vcl/canvas_inc/pch/precompiled_cairocanvas.cxx b/vcl/inc/canvas_inc/pch/precompiled_cairocanvas.cxx similarity index 100% rename from vcl/canvas_inc/pch/precompiled_cairocanvas.cxx rename to vcl/inc/canvas_inc/pch/precompiled_cairocanvas.cxx diff --git a/vcl/canvas_inc/pch/precompiled_cairocanvas.hxx b/vcl/inc/canvas_inc/pch/precompiled_cairocanvas.hxx similarity index 100% rename from vcl/canvas_inc/pch/precompiled_cairocanvas.hxx rename to vcl/inc/canvas_inc/pch/precompiled_cairocanvas.hxx diff --git a/vcl/canvas_inc/pch/precompiled_canvastools.cxx b/vcl/inc/canvas_inc/pch/precompiled_canvastools.cxx similarity index 100% rename from vcl/canvas_inc/pch/precompiled_canvastools.cxx rename to vcl/inc/canvas_inc/pch/precompiled_canvastools.cxx diff --git a/vcl/canvas_inc/pch/precompiled_canvastools.hxx b/vcl/inc/canvas_inc/pch/precompiled_canvastools.hxx similarity index 100% rename from vcl/canvas_inc/pch/precompiled_canvastools.hxx rename to vcl/inc/canvas_inc/pch/precompiled_canvastools.hxx diff --git a/vcl/canvas_inc/pch/precompiled_oglcanvas.cxx b/vcl/inc/canvas_inc/pch/precompiled_oglcanvas.cxx similarity index 100% rename from vcl/canvas_inc/pch/precompiled_oglcanvas.cxx rename to vcl/inc/canvas_inc/pch/precompiled_oglcanvas.cxx diff --git a/vcl/canvas_inc/pch/precompiled_oglcanvas.hxx b/vcl/inc/canvas_inc/pch/precompiled_oglcanvas.hxx similarity index 100% rename from vcl/canvas_inc/pch/precompiled_oglcanvas.hxx rename to vcl/inc/canvas_inc/pch/precompiled_oglcanvas.hxx diff --git a/vcl/canvas_inc/pch/precompiled_vclcanvas.cxx b/vcl/inc/canvas_inc/pch/precompiled_vclcanvas.cxx similarity index 100% rename from vcl/canvas_inc/pch/precompiled_vclcanvas.cxx rename to vcl/inc/canvas_inc/pch/precompiled_vclcanvas.cxx diff --git a/vcl/canvas_inc/pch/precompiled_vclcanvas.hxx b/vcl/inc/canvas_inc/pch/precompiled_vclcanvas.hxx similarity index 100% rename from vcl/canvas_inc/pch/precompiled_vclcanvas.hxx rename to vcl/inc/canvas_inc/pch/precompiled_vclcanvas.hxx diff --git a/vcl/canvas_inc/propertysethelper.hxx b/vcl/inc/canvas_inc/propertysethelper.hxx similarity index 100% rename from vcl/canvas_inc/propertysethelper.hxx rename to vcl/inc/canvas_inc/propertysethelper.hxx diff --git a/vcl/canvas_inc/rendering/icolorbuffer.hxx b/vcl/inc/canvas_inc/rendering/icolorbuffer.hxx similarity index 100% rename from vcl/canvas_inc/rendering/icolorbuffer.hxx rename to vcl/inc/canvas_inc/rendering/icolorbuffer.hxx diff --git a/vcl/canvas_inc/rendering/irendermodule.hxx b/vcl/inc/canvas_inc/rendering/irendermodule.hxx similarity index 100% rename from vcl/canvas_inc/rendering/irendermodule.hxx rename to vcl/inc/canvas_inc/rendering/irendermodule.hxx diff --git a/vcl/canvas_inc/rendering/isurface.hxx b/vcl/inc/canvas_inc/rendering/isurface.hxx similarity index 100% rename from vcl/canvas_inc/rendering/isurface.hxx rename to vcl/inc/canvas_inc/rendering/isurface.hxx diff --git a/vcl/canvas_inc/rendering/isurfaceproxy.hxx b/vcl/inc/canvas_inc/rendering/isurfaceproxy.hxx similarity index 100% rename from vcl/canvas_inc/rendering/isurfaceproxy.hxx rename to vcl/inc/canvas_inc/rendering/isurfaceproxy.hxx diff --git a/vcl/canvas_inc/rendering/isurfaceproxymanager.hxx b/vcl/inc/canvas_inc/rendering/isurfaceproxymanager.hxx similarity index 100% rename from vcl/canvas_inc/rendering/isurfaceproxymanager.hxx rename to vcl/inc/canvas_inc/rendering/isurfaceproxymanager.hxx diff --git a/vcl/canvas_inc/spriteredrawmanager.hxx b/vcl/inc/canvas_inc/spriteredrawmanager.hxx similarity index 100% rename from vcl/canvas_inc/spriteredrawmanager.hxx rename to vcl/inc/canvas_inc/spriteredrawmanager.hxx diff --git a/vcl/canvas_inc/vclwrapper.hxx b/vcl/inc/canvas_inc/vclwrapper.hxx similarity index 100% rename from vcl/canvas_inc/vclwrapper.hxx rename to vcl/inc/canvas_inc/vclwrapper.hxx diff --git a/vcl/canvas_inc/verifyinput.hxx b/vcl/inc/canvas_inc/verifyinput.hxx similarity index 100% rename from vcl/canvas_inc/verifyinput.hxx rename to vcl/inc/canvas_inc/verifyinput.hxx diff --git a/vcl/source/canvas/cairo/cairo_cachedbitmap.cxx b/vcl/source/canvas/cairo/cairo_cachedbitmap.cxx index 83c89aad50a8..31628897ac0a 100644 --- a/vcl/source/canvas/cairo/cairo_cachedbitmap.cxx +++ b/vcl/source/canvas/cairo/cairo_cachedbitmap.cxx @@ -24,8 +24,8 @@ #include <utility> #include <comphelper/diagnose_ex.hxx> -#include "cairo_cachedbitmap.hxx" -#include "cairo_repainttarget.hxx" +#include "canvas_inc/cairo_cachedbitmap.hxx" +#include "canvas_inc/cairo_repainttarget.hxx" using namespace ::cairo; diff --git a/vcl/source/canvas/cairo/cairo_canvas.cxx b/vcl/source/canvas/cairo/cairo_canvas.cxx index 931a3180bcce..7fb1ec852ff8 100644 --- a/vcl/source/canvas/cairo/cairo_canvas.cxx +++ b/vcl/source/canvas/cairo/cairo_canvas.cxx @@ -28,7 +28,7 @@ #include <vcl/skia/SkiaHelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include "cairo_canvas.hxx" +#include "canvas_inc/cairo_canvas.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_canvasbitmap.cxx b/vcl/source/canvas/cairo/cairo_canvasbitmap.cxx index b310a130ffc9..c4743ad3c3b8 100644 --- a/vcl/source/canvas/cairo/cairo_canvasbitmap.cxx +++ b/vcl/source/canvas/cairo/cairo_canvasbitmap.cxx @@ -28,8 +28,8 @@ #include <cairo.h> -#include "cairo_canvasbitmap.hxx" -#include "cairo_surfaceprovider.hxx" +#include "canvas_inc/cairo_canvasbitmap.hxx" +#include "canvas_inc/cairo_surfaceprovider.hxx" #include "vcl_canvas/graphicdevice.hxx" using namespace ::cairo; diff --git a/vcl/source/canvas/cairo/cairo_canvascustomsprite.cxx b/vcl/source/canvas/cairo/cairo_canvascustomsprite.cxx index 0cbf4a2e5ba2..ba52905f0c64 100644 --- a/vcl/source/canvas/cairo/cairo_canvascustomsprite.cxx +++ b/vcl/source/canvas/cairo/cairo_canvascustomsprite.cxx @@ -27,8 +27,8 @@ #include <canvas/canvastools.hxx> #include <cairo.h> -#include "cairo_canvascustomsprite.hxx" -#include "cairo_spritecanvas.hxx" +#include "canvas_inc/cairo_canvascustomsprite.hxx" +#include "canvas_inc/cairo_spritecanvas.hxx" using namespace ::cairo; diff --git a/vcl/source/canvas/cairo/cairo_canvasfont.cxx b/vcl/source/canvas/cairo/cairo_canvasfont.cxx index 2038f0eb7205..8946cbf3d8dc 100644 --- a/vcl/source/canvas/cairo/cairo_canvasfont.cxx +++ b/vcl/source/canvas/cairo/cairo_canvasfont.cxx @@ -29,8 +29,8 @@ #include <vcl_canvas/canvastools.hxx> -#include "cairo_canvasfont.hxx" -#include "cairo_textlayout.hxx" +#include "canvas_inc/cairo_canvasfont.hxx" +#include "canvas_inc/cairo_textlayout.hxx" using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_canvashelper.cxx b/vcl/source/canvas/cairo/cairo_canvashelper.cxx index 9af33b5adfc3..73b7e91ac919 100644 --- a/vcl/source/canvas/cairo/cairo_canvashelper.cxx +++ b/vcl/source/canvas/cairo/cairo_canvashelper.cxx @@ -49,14 +49,14 @@ #include <vcl/virdev.hxx> #include <vcl_canvas/canvastools.hxx> -#include <parametricpolypolygon.hxx> +#include <canvas_inc/parametricpolypolygon.hxx> #include <cairo.h> -#include "cairo_cachedbitmap.hxx" -#include "cairo_canvasbitmap.hxx" -#include "cairo_surfaceprovider.hxx" +#include "canvas_inc/cairo_cachedbitmap.hxx" +#include "canvas_inc/cairo_canvasbitmap.hxx" +#include "canvas_inc/cairo_surfaceprovider.hxx" #include "vcl_canvas/graphicdevice.hxx" -#include "cairo_canvashelper.hxx" +#include "canvas_inc/cairo_canvashelper.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_canvashelper_text.cxx b/vcl/source/canvas/cairo/cairo_canvashelper_text.cxx index 7a00a59a48c8..2d830a3da2f4 100644 --- a/vcl/source/canvas/cairo/cairo_canvashelper_text.cxx +++ b/vcl/source/canvas/cairo/cairo_canvashelper_text.cxx @@ -29,11 +29,11 @@ #include <vcl/virdev.hxx> #include <vcl_canvas/canvastools.hxx> -#include <verifyinput.hxx> +#include <canvas_inc/verifyinput.hxx> -#include "cairo_canvasfont.hxx" -#include "cairo_canvashelper.hxx" -#include "cairo_textlayout.hxx" +#include "canvas_inc/cairo_canvasfont.hxx" +#include "canvas_inc/cairo_canvashelper.hxx" +#include "canvas_inc/cairo_textlayout.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_devicehelper.cxx b/vcl/source/canvas/cairo/cairo_devicehelper.cxx index de1c266a4470..aac1c8dad1b2 100644 --- a/vcl/source/canvas/cairo/cairo_devicehelper.cxx +++ b/vcl/source/canvas/cairo/cairo_devicehelper.cxx @@ -29,8 +29,8 @@ #include <vcl_canvas/canvastools.hxx> -#include "cairo_canvasbitmap.hxx" -#include "cairo_devicehelper.hxx" +#include "canvas_inc/cairo_canvasbitmap.hxx" +#include "canvas_inc/cairo_devicehelper.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_spritecanvas.cxx b/vcl/source/canvas/cairo/cairo_spritecanvas.cxx index 3aa987df5ed0..6e23ac933313 100644 --- a/vcl/source/canvas/cairo/cairo_spritecanvas.cxx +++ b/vcl/source/canvas/cairo/cairo_spritecanvas.cxx @@ -33,7 +33,7 @@ #include <comphelper/diagnose_ex.hxx> #include <cppuhelper/supportsservice.hxx> -#include "cairo_spritecanvas.hxx" +#include "canvas_inc/cairo_spritecanvas.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_spritecanvashelper.cxx b/vcl/source/canvas/cairo/cairo_spritecanvashelper.cxx index c9c7be87140a..7345a252de56 100644 --- a/vcl/source/canvas/cairo/cairo_spritecanvashelper.cxx +++ b/vcl/source/canvas/cairo/cairo_spritecanvashelper.cxx @@ -30,9 +30,9 @@ #include <cairo.h> -#include "cairo_canvascustomsprite.hxx" +#include "canvas_inc/cairo_canvascustomsprite.hxx" #include "vcl_canvas/customsprite.hxx" -#include "cairo_spritecanvashelper.hxx" +#include "canvas_inc/cairo_spritecanvashelper.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_spritedevicehelper.cxx b/vcl/source/canvas/cairo/cairo_spritedevicehelper.cxx index 33db9231a8fd..fa84bf6340c0 100644 --- a/vcl/source/canvas/cairo/cairo_spritedevicehelper.cxx +++ b/vcl/source/canvas/cairo/cairo_spritedevicehelper.cxx @@ -24,8 +24,8 @@ #include <cairo.h> -#include "cairo_devicehelper.hxx" -#include "cairo_spritecanvas.hxx" +#include "canvas_inc/cairo_devicehelper.hxx" +#include "canvas_inc/cairo_spritecanvas.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_spritehelper.cxx b/vcl/source/canvas/cairo/cairo_spritehelper.cxx index 879f28708522..3f600f52ff56 100644 --- a/vcl/source/canvas/cairo/cairo_spritehelper.cxx +++ b/vcl/source/canvas/cairo/cairo_spritehelper.cxx @@ -30,8 +30,8 @@ #include <cairo.h> #include <pixman.h> -#include "cairo_spritehelper.hxx" -#include "cairo_surfaceprovider.hxx" +#include "canvas_inc/cairo_spritehelper.hxx" +#include "canvas_inc/cairo_surfaceprovider.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/cairo/cairo_textlayout.cxx b/vcl/source/canvas/cairo/cairo_textlayout.cxx index d600c05670c2..25c96d83e2ad 100644 --- a/vcl/source/canvas/cairo/cairo_textlayout.cxx +++ b/vcl/source/canvas/cairo/cairo_textlayout.cxx @@ -33,7 +33,7 @@ #include <vcl/metric.hxx> #include <vcl/virdev.hxx> -#include "cairo_textlayout.hxx" +#include "canvas_inc/cairo_textlayout.hxx" using namespace ::cairo; using namespace ::com::sun::star; diff --git a/vcl/source/canvas/tools/cachedprimitivebase.cxx b/vcl/source/canvas/tools/cachedprimitivebase.cxx index 2bec29d2738d..509d42717a62 100644 --- a/vcl/source/canvas/tools/cachedprimitivebase.cxx +++ b/vcl/source/canvas/tools/cachedprimitivebase.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/rendering/RepaintResult.hpp> #include <cppuhelper/supportsservice.hxx> -#include <base/cachedprimitivebase.hxx> +#include <canvas_inc/base/cachedprimitivebase.hxx> #include <utility> diff --git a/vcl/source/canvas/tools/canvascustomspritehelper.cxx b/vcl/source/canvas/tools/canvascustomspritehelper.cxx index 9ff6cca8d270..731d8d1330f6 100644 --- a/vcl/source/canvas/tools/canvascustomspritehelper.cxx +++ b/vcl/source/canvas/tools/canvascustomspritehelper.cxx @@ -32,7 +32,7 @@ #include <rtl/math.hxx> #include <comphelper/diagnose_ex.hxx> -#include <base/canvascustomspritehelper.hxx> +#include <canvas_inc/base/canvascustomspritehelper.hxx> #include <vcl_canvas/canvastools.hxx> using namespace ::com::sun::star; diff --git a/vcl/source/canvas/tools/page.hxx b/vcl/source/canvas/tools/page.hxx index ff60284a17e5..761383731a46 100644 --- a/vcl/source/canvas/tools/page.hxx +++ b/vcl/source/canvas/tools/page.hxx @@ -22,9 +22,9 @@ #include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basegfx/range/b2irectangle.hxx> -#include <rendering/icolorbuffer.hxx> -#include <rendering/irendermodule.hxx> -#include <rendering/isurface.hxx> +#include <canvas_inc/rendering/icolorbuffer.hxx> +#include <canvas_inc/rendering/irendermodule.hxx> +#include <canvas_inc/rendering/isurface.hxx> #include <memory> #include <vector> diff --git a/vcl/source/canvas/tools/pagemanager.hxx b/vcl/source/canvas/tools/pagemanager.hxx index d8f485758b29..8acb4410b07d 100644 --- a/vcl/source/canvas/tools/pagemanager.hxx +++ b/vcl/source/canvas/tools/pagemanager.hxx @@ -20,7 +20,7 @@ #pragma once #include <basegfx/vector/b2isize.hxx> -#include <rendering/irendermodule.hxx> +#include <canvas_inc/rendering/irendermodule.hxx> #include <utility> #include "page.hxx" diff --git a/vcl/source/canvas/tools/parametricpolypolygon.cxx b/vcl/source/canvas/tools/parametricpolypolygon.cxx index 8993a0b00bdc..05f1cc55a650 100644 --- a/vcl/source/canvas/tools/parametricpolypolygon.cxx +++ b/vcl/source/canvas/tools/parametricpolypolygon.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/rendering/XGraphicDevice.hpp> -#include <parametricpolypolygon.hxx> +#include <canvas_inc/parametricpolypolygon.hxx> #include <utility> using namespace ::com::sun::star; diff --git a/vcl/source/canvas/tools/propertysethelper.cxx b/vcl/source/canvas/tools/propertysethelper.cxx index d032fb840833..8bc74a0da03c 100644 --- a/vcl/source/canvas/tools/propertysethelper.cxx +++ b/vcl/source/canvas/tools/propertysethelper.cxx @@ -21,7 +21,7 @@ #include <string_view> -#include <propertysethelper.hxx> +#include <canvas_inc/propertysethelper.hxx> #include <com/sun/star/beans/PropertyVetoException.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> diff --git a/vcl/source/canvas/tools/spriteredrawmanager.cxx b/vcl/source/canvas/tools/spriteredrawmanager.cxx index 9dc7e55c2294..9c709058a468 100644 --- a/vcl/source/canvas/tools/spriteredrawmanager.cxx +++ b/vcl/source/canvas/tools/spriteredrawmanager.cxx @@ -26,7 +26,7 @@ #include <comphelper/diagnose_ex.hxx> #include <sal/log.hxx> -#include <spriteredrawmanager.hxx> +#include <canvas_inc/spriteredrawmanager.hxx> #include <boost/range/adaptor/reversed.hpp> #include <utility> diff --git a/vcl/source/canvas/tools/surface.hxx b/vcl/source/canvas/tools/surface.hxx index 08a261501715..5846cc286697 100644 --- a/vcl/source/canvas/tools/surface.hxx +++ b/vcl/source/canvas/tools/surface.hxx @@ -25,7 +25,7 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/vector/b2isize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <rendering/icolorbuffer.hxx> +#include <canvas_inc/rendering/icolorbuffer.hxx> #include "pagemanager.hxx" diff --git a/vcl/source/canvas/tools/surfaceproxy.hxx b/vcl/source/canvas/tools/surfaceproxy.hxx index c5d484ed454c..6bede5789a41 100644 --- a/vcl/source/canvas/tools/surfaceproxy.hxx +++ b/vcl/source/canvas/tools/surfaceproxy.hxx @@ -19,8 +19,8 @@ #pragma once -#include <rendering/isurfaceproxy.hxx> -#include <rendering/icolorbuffer.hxx> +#include <canvas_inc/rendering/isurfaceproxy.hxx> +#include <canvas_inc/rendering/icolorbuffer.hxx> #include "pagemanager.hxx" #include "surface.hxx" diff --git a/vcl/source/canvas/tools/surfaceproxymanager.cxx b/vcl/source/canvas/tools/surfaceproxymanager.cxx index 5990fe3b1cfb..396b8d65893a 100644 --- a/vcl/source/canvas/tools/surfaceproxymanager.cxx +++ b/vcl/source/canvas/tools/surfaceproxymanager.cxx @@ -19,8 +19,8 @@ #include <sal/config.h> -#include <rendering/isurfaceproxy.hxx> -#include <rendering/isurfaceproxymanager.hxx> +#include <canvas_inc/rendering/isurfaceproxy.hxx> +#include <canvas_inc/rendering/isurfaceproxymanager.hxx> #include "surfaceproxy.hxx" diff --git a/vcl/source/canvas/tools/verifyinput.cxx b/vcl/source/canvas/tools/verifyinput.cxx index 76b695640703..069b5999d711 100644 --- a/vcl/source/canvas/tools/verifyinput.cxx +++ b/vcl/source/canvas/tools/verifyinput.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/rendering/ViewState.hpp> #include <com/sun/star/util/Endianness.hpp> -#include <verifyinput.hxx> +#include <canvas_inc/verifyinput.hxx> using namespace ::com::sun::star; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d2a94f0bf907..1670a63b6f16 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -61,7 +61,7 @@ #include <helpwin.hxx> #include <dndlistenercontainer.hxx> #include <dndeventdispatcher.hxx> -#include <cairo_spritecanvas.hxx> +#include <canvas_inc/cairo_spritecanvas.hxx> #include <com/sun/star/accessibility/AccessibleRelation.hpp> #include <com/sun/star/accessibility/XAccessible.hpp>
