diff options
| -rw-r--r-- | cppcanvas/source/wrapper/implbitmapcanvas.hxx | 10 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implcanvas.hxx | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index 6f09794caf99..f2ccaf42153d 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -39,16 +39,16 @@ namespace cppcanvas explicit ImplBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& rCanvas ); virtual ~ImplBitmapCanvas() override; + ImplBitmapCanvas(ImplBitmapCanvas const &) = default; + ImplBitmapCanvas(ImplBitmapCanvas &&) = default; + ImplBitmapCanvas & operator =(ImplBitmapCanvas const &) = default; + ImplBitmapCanvas & operator =(ImplBitmapCanvas &&) = default; + virtual ::basegfx::B2ISize getSize() const override; virtual CanvasSharedPtr clone() const override; - // take compiler-provided default copy constructor - //ImplBitmapCanvas(const ImplBitmapCanvas&); - private: - ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) = delete; - const css::uno::Reference< css::rendering::XBitmapCanvas > mxBitmapCanvas; const css::uno::Reference< css::rendering::XBitmap > mxBitmap; }; diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index b71f2311f67b..b6f8d02da87c 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -53,6 +53,11 @@ namespace cppcanvas explicit ImplCanvas( const css::uno::Reference< css::rendering::XCanvas >& rCanvas ); virtual ~ImplCanvas() override; + ImplCanvas(ImplCanvas const &) = default; + ImplCanvas(ImplCanvas &&) = default; + ImplCanvas & operator =(ImplCanvas const &) = default; + ImplCanvas & operator =(ImplCanvas &&) = default; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override; virtual ::basegfx::B2DHomMatrix getTransformation() const override; @@ -69,12 +74,7 @@ namespace cppcanvas virtual css::rendering::ViewState getViewState() const override; - // take compiler-provided default copy constructor - //ImplCanvas(const ImplCanvas&); - private: - ImplCanvas& operator=( const ImplCanvas& ) = delete; - mutable css::rendering::ViewState maViewState; boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; const css::uno::Reference< css::rendering::XCanvas > mxCanvas; |