summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-05-12 16:08:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-05-12 19:00:00 +0200
commit203e3099c17bf245f8fcd52c32c58d47bd241c2b (patch)
tree805b01deb02d3bc88582fb4812b4d94c94e65d03 /cppcanvas
parentf4932d61e52d595156af1f63e9fb4bed18b63254 (diff)
make Bitmap/BitmapEx constructors explicit
and add BitmapEx::operator=(Bitmap const &) Image::Image(Bitmap const &) to lessen the fallout Change-Id: Iff5fab88d167a7be739c370c9933d36c297bc61c Reviewed-on: https://gerrit.libreoffice.org/54162 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index ce5e4d74d7d0..25e9b1b3f1a3 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -2108,7 +2108,7 @@ namespace cppcanvas
std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
- pAct->GetBitmap(),
+ BitmapEx(pAct->GetBitmap()),
rStates.getState().mapModeTransform *
vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rCanvas,
@@ -2131,7 +2131,7 @@ namespace cppcanvas
std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
- pAct->GetBitmap(),
+ BitmapEx(pAct->GetBitmap()),
rStates.getState().mapModeTransform *
vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
@@ -2163,7 +2163,7 @@ namespace cppcanvas
std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
- aBmp,
+ BitmapEx(aBmp),
rStates.getState().mapModeTransform *
vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
rStates.getState().mapModeTransform *