[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |    2 +-
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx   |    2 +-
 drawinglayer/source/tools/converters.cxx                     |    2 +-
 include/drawinglayer/converters.hxx                          |   10 ++++------
 4 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 1bcad85a5d48cc38ced5883de364f2c66ada273e
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon May 3 23:21:18 2021 +0900
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue May 11 01:16:23 2021 +0200

    drawinglayer: move converter.hxx to public include
    
    Change-Id: I71a15c532ba161d69585bd47631b3a8e2f6ddd66
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115304
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 66b29591df7e..2f750e73af65 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -33,7 +33,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 
-#include <converters.hxx>
+#include <drawinglayer/converters.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index ec1f9621452a..0e5b1a218690 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -28,7 +28,7 @@
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include <converters.hxx>
+#include <drawinglayer/converters.hxx>
 
 using namespace com::sun::star;
 
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index 6a963748161f..d8fe291bf803 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -25,7 +25,7 @@
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <vcl/virdev.hxx>
 
-#include <converters.hxx>
+#include <drawinglayer/converters.hxx>
 
 #ifdef DBG_UTIL
 #include <tools/stream.hxx>
diff --git a/drawinglayer/inc/converters.hxx b/include/drawinglayer/converters.hxx
similarity index 79%
rename from drawinglayer/inc/converters.hxx
rename to include/drawinglayer/converters.hxx
index 5e4e8a49bdb5..64d0e2ce7d4e 100644
--- a/drawinglayer/inc/converters.hxx
+++ b/include/drawinglayer/converters.hxx
@@ -24,12 +24,10 @@
 
 namespace drawinglayer
 {
-    BitmapEx convertToBitmapEx(
-        const drawinglayer::primitive2d::Primitive2DContainer& rSeq,
-        const geometry::ViewInformation2D& rViewInformation2D,
-        sal_uInt32 nDiscreteWidth,
-        sal_uInt32 nDiscreteHeight,
-        sal_uInt32 nMaxSquarePixels);
+BitmapEx DRAWINGLAYER_DLLPUBLIC
+convertToBitmapEx(const drawinglayer::primitive2d::Primitive2DContainer& rSeq,
+                  const geometry::ViewInformation2D& rViewInformation2D, sal_uInt32 nDiscreteWidth,
+                  sal_uInt32 nDiscreteHeight, sal_uInt32 nMaxSquarePixels);
 
 } // end of namespace drawinglayer