Separate core drawinglayer func. into drawinglayercore library

This separates the drawinglayer core functionallity into a
separate library, to keep a strict separation what is backend
dependent and what is not. More strict separation can be done
at a later date.

This will make it possible to push part of drawinglayer
(part of processor2d) directly into VCL.

Change-Id: Ibc26580067e50bf20d7cdd37fa0e44eb10200878
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127286
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

Repository.mk

@@ -361,6 +361,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(call gb_Helper_optional,SCRIPTING,dlgprov) \
 	$(if $(filter WNT,$(OS)),directx9canvas) \
 	$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
+	drawinglayercore \
 	drawinglayer \
 	editeng \
 	$(if $(filter WNT,$(OS)),emser) \

drawinglayer/CppunitTest_drawinglayer_border.mk

@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_border, \
 	sal \
 	salhelper \
 	drawinglayer \
+	drawinglayercore \
 	vcl \
 	test \
 	tl \

drawinglayer/CppunitTest_drawinglayer_processors.mk

@@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_processors, \
 	sal \
 	salhelper \
 	drawinglayer \
+	drawinglayercore \
 	vcl \
 	test \
 	tl \

drawinglayer/Library_drawinglayer.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_externals,drawinglayer,\
 ))
 
 $(eval $(call gb_Library_use_libraries,drawinglayer,\
+    drawinglayercore \
     basegfx \
     canvastools \
     comphelper \
@@ -67,14 +68,11 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/attribute/sdrsceneattribute3d \
     drawinglayer/source/attribute/sdrshadowattribute \
     drawinglayer/source/attribute/strokeattribute \
-    drawinglayer/source/geometry/viewinformation2d \
     drawinglayer/source/geometry/viewinformation3d \
     drawinglayer/source/primitive2d/animatedprimitive2d \
     drawinglayer/source/primitive2d/backgroundcolorprimitive2d \
-    drawinglayer/source/primitive2d/baseprimitive2d \
     drawinglayer/source/primitive2d/bitmapprimitive2d \
     drawinglayer/source/primitive2d/borderlineprimitive2d \
-    drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D \
     drawinglayer/source/primitive2d/controlprimitive2d \
     drawinglayer/source/primitive2d/cropprimitive2d \
     drawinglayer/source/primitive2d/discretebitmapprimitive2d \
@@ -112,7 +110,6 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D \
     drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D \
     drawinglayer/source/primitive2d/primitivetools2d \
-    drawinglayer/source/primitive2d/Primitive2DContainer \
     drawinglayer/source/primitive2d/sceneprimitive2d \
     drawinglayer/source/primitive2d/sdrdecompositiontools2d \
     drawinglayer/source/primitive2d/shadowprimitive2d \
@@ -128,7 +125,6 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\
     drawinglayer/source/primitive2d/textlineprimitive2d \
     drawinglayer/source/primitive2d/textprimitive2d \
     drawinglayer/source/primitive2d/textstrikeoutprimitive2d \
-    drawinglayer/source/primitive2d/Tools \
     drawinglayer/source/primitive2d/transformprimitive2d \
     drawinglayer/source/primitive2d/transparenceprimitive2d \
     drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d \

drawinglayer/Library_drawinglayercore.mk

@@ -0,0 +1,50 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,drawinglayercore))
+
+$(eval $(call gb_Library_set_include,drawinglayercore,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/drawinglayer/inc \
+))
+
+$(eval $(call gb_Library_add_defs,drawinglayercore,\
+    -DDRAWINGLAYERCORE_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_set_precompiled_header,drawinglayercore,drawinglayer/inc/pch/precompiled_drawinglayercore))
+
+$(eval $(call gb_Library_use_sdk_api,drawinglayercore))
+
+$(eval $(call gb_Library_use_externals,drawinglayercore,\
+    boost_headers \
+    libxml2 \
+))
+
+$(eval $(call gb_Library_use_libraries,drawinglayercore,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nlangtag \
+    sal \
+    salhelper \
+    svl \
+    tl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,drawinglayercore,\
+    drawinglayer/source/primitive2d/baseprimitive2d \
+    drawinglayer/source/primitive2d/BufferedDecompositionPrimitive2D \
+    drawinglayer/source/primitive2d/Primitive2DContainer \
+    drawinglayer/source/primitive2d/Tools \
+    drawinglayer/source/geometry/viewinformation2d \
+))
+
+# vim: set noet sw=4 ts=4:

drawinglayer/Module_drawinglayer.mk

@@ -10,6 +10,7 @@
 $(eval $(call gb_Module_Module,drawinglayer))
 
 $(eval $(call gb_Module_add_targets,drawinglayer,\
+    Library_drawinglayercore \
     Library_drawinglayer \
 ))
 

drawinglayer/inc/pch/precompiled_drawinglayer.hxx

@@ -90,7 +90,6 @@
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
-#include <basegfx/utils/canvastools.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/vector/b2ivector.hxx>
@@ -102,7 +101,7 @@
 #include <com/sun/star/drawing/TextureMode.hpp>
 #include <com/sun/star/drawing/TextureProjectionMode.hpp>
 #include <com/sun/star/graphic/XPrimitive3D.hpp>
-#include <com/sun/star/util/XAccounting.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
@@ -137,15 +136,11 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
-#include <drawinglayer/primitive2d/CommonTypes.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx>
-#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
-#include <drawinglayer/primitive2d/Primitive2DVisitor.hxx>
-#include <drawinglayer/primitive2d/Tools.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>

drawinglayer/inc/pch/precompiled_drawinglayercore.cxx

@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "precompiled_drawinglayercore.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

drawinglayer/inc/pch/precompiled_drawinglayercore.hxx

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/*
+ This file has been autogenerated by update_pch.sh. It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed). All such
+ manual changes will be rewritten by the next run of update_pch.sh (which presumably
+ also fixes all possible problems, so it's usually better to use it).
+
+ Generated on 2020-03-07 12:37:18 using:
+ ./bin/update_pch drawinglayer drawinglayercore --cutoff=4 --exclude:system --exclude:module --exclude:local
+
+ If after updating build fails, use the following command to locate conflicting headers:
+ ./bin/update_pch_bisect ./drawinglayer/inc/pch/precompiled_drawinglayercore.hxx "make drawinglayer.build" --find-conflicts
+*/
+
+#if PCH_LEVEL >= 1
+#include <ostream>
+#include <vector>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#include <osl/diagnose.h>
+#include <osl/interlck.h>
+#include <sal/config.h>
+#include <sal/types.h>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <basegfx/basegfxdllapi.h>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/basicrange.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <drawinglayer/geometry/viewinformation2d.hxx>
+#endif // PCH_LEVEL >= 4
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

emfio/CppunitTest_emfio_emf.mk

@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,emfio_emf))
 $(eval $(call gb_CppunitTest_use_libraries,emfio_emf,\
     basegfx \
     drawinglayer \
+    drawinglayercore \
     cppu \
     cppuhelper \
     comphelper \

emfio/Library_emfio.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_sdk_api,emfio))
 
 $(eval $(call gb_Library_use_libraries,emfio,\
     basegfx \
+    drawinglayercore \
     drawinglayer \
     cppu \
     cppuhelper \

filter/Library_pdffilter.mk

@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\
 	cppu \
 	sal \
 	drawinglayer \
+	drawinglayercore \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,pdffilter,\

filter/Library_svgfilter.mk

@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\
 	sax \
 	salhelper \
 	comphelper \
+	drawinglayercore \
 	drawinglayer \
 	basegfx \
 	cppuhelper \

include/drawinglayer/drawinglayerdllapi.h

@@ -19,6 +19,12 @@
 #endif
 #define DRAWINGLAYER_DLLPRIVATE SAL_DLLPRIVATE
 
+#if defined(DRAWINGLAYERCORE_DLLIMPLEMENTATION)
+#define DRAWINGLAYERCORE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define DRAWINGLAYERCORE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/drawinglayer/geometry/viewinformation2d.hxx

@@ -60,7 +60,7 @@ namespace drawinglayer::geometry
     This class holds all view-relevant information for a 2d geometry.
     The most used data is for convenience offered directly using basegfx tooling classes.
 */
-class DRAWINGLAYER_DLLPUBLIC ViewInformation2D
+class DRAWINGLAYERCORE_DLLPUBLIC ViewInformation2D
 {
 public:
     typedef o3tl::cow_wrapper<ImpViewInformation2D, o3tl::ThreadSafeRefCountingPolicy> ImplType;
@@ -140,7 +140,7 @@ public:
     bool getReducedDisplayQuality() const;
 };
 
-DRAWINGLAYER_DLLPUBLIC ViewInformation2D
+DRAWINGLAYERCORE_DLLPUBLIC ViewInformation2D
 createViewInformation2D(const css::uno::Sequence<css::beans::PropertyValue>& rViewParameters);
 
 } // end of namespace drawinglayer::geometry

include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx

@@ -59,7 +59,7 @@ namespace drawinglayer::primitive2d
         to identify if a new decomposition is needed at the next call
     (f) return maBuffered2DDecomposition
  */
-class DRAWINGLAYER_DLLPUBLIC BufferedDecompositionPrimitive2D : public BasePrimitive2D
+class DRAWINGLAYERCORE_DLLPUBLIC BufferedDecompositionPrimitive2D : public BasePrimitive2D
 {
 private:
     /// a sequence used for buffering the last create2DDecomposition() result

include/drawinglayer/primitive2d/Primitive2DContainer.hxx

@@ -34,7 +34,7 @@ class ViewInformation2D;
 
 namespace drawinglayer::primitive2d
 {
-class SAL_WARN_UNUSED DRAWINGLAYER_DLLPUBLIC Primitive2DContainer final
+class SAL_WARN_UNUSED DRAWINGLAYERCORE_DLLPUBLIC Primitive2DContainer final
     : public std::deque<Primitive2DReference>,
       public Primitive2DDecompositionVisitor
 {

include/drawinglayer/primitive2d/Primitive2DVisitor.hxx

@@ -27,7 +27,7 @@ namespace drawinglayer::primitive2d
 class Primitive2DContainer;
 
 // Visitor class for walking a tree of Primitive2DReference
-class DRAWINGLAYER_DLLPUBLIC Primitive2DDecompositionVisitor
+class DRAWINGLAYERCORE_DLLPUBLIC Primitive2DDecompositionVisitor
 {
 public:
     virtual void visit(const Primitive2DReference&) = 0;

include/drawinglayer/primitive2d/Tools.hxx

@@ -31,16 +31,16 @@ class ViewInformation2D;
 namespace drawinglayer::primitive2d
 {
 /// get B2DRange from a given Primitive2DReference
-basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(
+basegfx::B2DRange DRAWINGLAYERCORE_DLLPUBLIC getB2DRangeFromPrimitive2DReference(
     const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation);
 
 /** compare two Primitive2DReferences for equality, including trying to get implementations (BasePrimitive2D)
     and using compare operator
  */
-bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DReferencesEqual(const Primitive2DReference& rA,
+bool DRAWINGLAYERCORE_DLLPUBLIC arePrimitive2DReferencesEqual(const Primitive2DReference& rA,
-                                                          const Primitive2DReference& rB);
+                                                              const Primitive2DReference& rB);
 
-OUString DRAWINGLAYER_DLLPUBLIC idToString(sal_uInt32 nId);
+OUString DRAWINGLAYERCORE_DLLPUBLIC idToString(sal_uInt32 nId);
 
 } // end of namespace drawinglayer::primitive2d
 

include/drawinglayer/primitive2d/baseprimitive2d.hxx

@@ -40,11 +40,11 @@ class ViewInformation2D;
 /** This is a custom re-implementation of cppu::WeakComponentImplHelper which uses
    std::mutex and skips parts of the XComponent stuff.
 */
-class DRAWINGLAYER_DLLPUBLIC BasePrimitive2DImplBase : public cppu::OWeakObject,
+class DRAWINGLAYERCORE_DLLPUBLIC BasePrimitive2DImplBase : public cppu::OWeakObject,
-                                                       public css::lang::XComponent,
+                                                           public css::lang::XComponent,
-                                                       public css::lang::XTypeProvider,
+                                                           public css::lang::XTypeProvider,
-                                                       public css::graphic::XPrimitive2D,
+                                                           public css::graphic::XPrimitive2D,
-                                                       public css::util::XAccounting
+                                                           public css::util::XAccounting
 {
 public:
     virtual ~BasePrimitive2DImplBase() override;
@@ -146,7 +146,7 @@ namespace drawinglayer::primitive2d
     for view-independent primitives which are defined by not using ViewInformation2D
     in their get2DDecomposition/getB2DRange implementations.
 */
-class DRAWINGLAYER_DLLPUBLIC BasePrimitive2D : public BasePrimitive2DImplBase
+class DRAWINGLAYERCORE_DLLPUBLIC BasePrimitive2D : public BasePrimitive2DImplBase
 {
     BasePrimitive2D(const BasePrimitive2D&) = delete;
     BasePrimitive2D& operator=(const BasePrimitive2D&) = delete;

sc/CppunitTest_sc_addin_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_addin_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_anchor_test.mk

@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_anchor_test, \
 	cppu \
 	cppuhelper \
 	drawinglayer \
+	drawinglayercore \
 	editeng \
 	for \
 	forui \

sc/CppunitTest_sc_array_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_array_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_bugfix_test.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_bugfix_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_cache_test.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cache_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_chart2dataprovider.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart2dataprovider, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_chart_regression_test.mk

@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_cond_format_merge.mk

@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_cond_format_merge, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_copypaste.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_copypaste, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_database_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_database_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_datapilotitemobj.mk

@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotitemobj, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_datapilottablesobj.mk

@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottablesobj, \
 	cppu \
 	cppuhelper \
 	drawinglayer \
+	drawinglayercore \
 	editeng \
 	for \
 	forui \

sc/CppunitTest_sc_dataprovider.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_dataprovider, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_datatransformation.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datatransformation, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_datetime_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_datetime_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_filters_test.mk

@@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_financial_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_financial_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_functions_test_old.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_functions_test_old, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_html_export_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_html_export_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_information_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_information_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_logical_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_logical_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_macros_test.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_mark_test.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_mark_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_mathematical_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_mathematical_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_namedrangeobj.mk

@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_new_cond_format_api.mk

@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_new_cond_format_api, \
 	cppu \
 	cppuhelper \
 	drawinglayer \
+	drawinglayercore \
 	editeng \
 	for \
 	forui \

sc/CppunitTest_sc_opencl_test.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_parallelism.mk

@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \
     cppuhelper \
     dbtools \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_perfobj.mk

@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_perfobj, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_pivottable_filters_test.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_pivottable_filters_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_range_test.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_range_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_rangelst_test.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_spreadsheet_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheet_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_statistical_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_statistical_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/CppunitTest_sc_text_functions_test.mk

@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_text_functions_test, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sc/Library_sc.mk

@@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,sc,\
     cppu \
     cppuhelper \
     dbtools \
+    drawinglayercore \
     drawinglayer \
     editeng \
     for \

sc/ucalc_setup.mk

@@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc$(1), \
     cppuhelper \
     dbtools \
     drawinglayer \
+    drawinglayercore \
     editeng \
     for \
     forui \

sd/CppunitTest_sd_uimpress.mk

@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     i18nlangtag \
     i18nutil \

sd/Library_sd.mk

@@ -74,6 +74,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
 	cppcanvas \
 	cppu \
 	cppuhelper \
+	drawinglayercore \
 	drawinglayer \
 	editeng \
 	i18nlangtag \

sfx2/Library_sfx.mk

@@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,sfx,\
     comphelper \
     cppu \
     cppuhelper \
+    drawinglayercore \
     drawinglayer \
     fwk \
     i18nlangtag \

svgio/CppunitTest_svgio.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_library_objects,svgio,\
 $(eval $(call gb_CppunitTest_use_libraries,svgio,\
     basegfx \
     drawinglayer \
+    drawinglayercore \
     cppu \
     cppuhelper \
     comphelper \

svgio/CppunitTest_svgio_read.mk

@@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svgio_read, \
 	cppu \
 	cppuhelper \
 	drawinglayer \
+	drawinglayercore \
 	editeng \
 	i18nlangtag \
 	sal \

svgio/CppunitTest_svgio_tools.mk

@@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_library_objects,svgio_tools,\
 $(eval $(call gb_CppunitTest_use_libraries,svgio_tools,\
     basegfx \
     drawinglayer \
+    drawinglayercore \
     comphelper \
     cppu \
     cppuhelper \

svgio/Library_svgio.mk

@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_sdk_api,svgio))
 
 $(eval $(call gb_Library_use_libraries,svgio,\
     basegfx \
+    drawinglayercore \
     drawinglayer \
     comphelper \
     cppu \

svx/CppunitTest_svx_removewhichrange.mk

@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svx_removewhichrange, \
     cppu \
     cppuhelper \
     drawinglayer \
+    drawinglayercore \
     editeng \
     fwk \
     i18nlangtag \

svx/CppunitTest_svx_unit.mk

@@ -38,7 +38,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \
 $(eval $(call gb_CppunitTest_use_libraries,svx_unit, \
 	basegfx \
 	drawinglayer \
-	editeng \
+	drawinglayercore \
+    editeng \
 	sal \
 	sfx \
     svl \

svx/Library_svx.mk

@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
 		crashreport) \
     $(call gb_Helper_optional,DBCONNECTIVITY, \
         dbtools) \
+    drawinglayercore \
     drawinglayer \
     editeng \
     fwk \

svx/Library_svxcore.mk

@@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
     cppu \
     $(call gb_Helper_optional,DBCONNECTIVITY, \
         dbtools) \
+    drawinglayercore \
     drawinglayer \
     editeng \
     fwk \

sw/CppunitTest_sw_uwriter.mk

@@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \
     $(call gb_Helper_optional,DBCONNECTIVITY, \
         dbtools) \
     drawinglayer \
+    drawinglayercore \
     editeng \
     i18nlangtag \
     i18nutil \

sw/Library_sw.mk

@@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,sw,\
     cppuhelper \
     $(call gb_Helper_optional,DBCONNECTIVITY, \
         dbtools) \
+    drawinglayercore \
     drawinglayer \
     editeng \
     i18nlangtag \

sw/Library_swui.mk

@@ -76,6 +76,7 @@ $(eval $(call gb_Library_use_libraries,swui,\
     ucbhelper \
     utl \
     vcl \
+    drawinglayercore \
     drawinglayer \
 ))
 

test/Library_test.mk

@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,test,\
 	unotest \
 	vcl \
 	drawinglayer \
+	drawinglayercore \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,test,\