Move (and rename) graphic stuff from svtools to vcl

This is preparing to change how GraphicManager works where it won't base itself around GraphicObject anymore but Graphic. No functional or cosmetic change was made to the classes, only changes that were needed because of the move and rename. The only thing that wasn't moved is the GraphicRenderer as it is not needed in vcl for now (but makes sense to move it in the future to keep graphic stuff together). grfmgr was renamed to GraphicObject as the GraphicManager will be changed a lot and most likely moved out, so the name grfmgr won't make any sense anymore. All the UNO implementations were renamed with a prefix Uno and used the same name as the class name. This is made to be more specific which are the Uno objects (for example graphic.cxx contained the implementation of XGraphic, which is similar to graph.cxx contains Graphic). Change-Id: I54a2fa6c7e997469aaa7770db05244adb9f64137 Reviewed-on: https://gerrit.libreoffice.org/51068Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

Move (and rename) graphic stuff from svtools to vcl
This is preparing to change how GraphicManager works where it won't base itself around GraphicObject anymore but Graphic. No functional or cosmetic change was made to the classes, only changes that were needed because of the move and rename. The only thing that wasn't moved is the GraphicRenderer as it is not needed in vcl for now (but makes sense to move it in the future to keep graphic stuff together). grfmgr was renamed to GraphicObject as the GraphicManager will be changed a lot and most likely moved out, so the name grfmgr won't make any sense anymore. All the UNO implementations were renamed with a prefix Uno and used the same name as the class name. This is made to be more specific which are the Uno objects (for example graphic.cxx contained the implementation of XGraphic, which is similar to graph.cxx contains Graphic). Change-Id: I54a2fa6c7e997469aaa7770db05244adb9f64137 Reviewed-on: https://gerrit.libreoffice.org/51068Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
7fbb96c2 · Tomaž Vajngerl · Tomaž Vajngerl · e6d2332e · 7fbb96c2 · 7fbb96c2
Kaydet (Commit) 7fbb96c2 authored Mar 11, 2018 tarafından Tomaž Vajngerl Kaydeden (comit) Tomaž Vajngerl Mar 11, 2018
190 changed files
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -444,7 +444,7 @@
 #include <svl/whiter.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/framestatuslistener.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svtools/imgdef.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <svtools/statusbarcontroller.hxx>

--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -43,7 +43,7 @@
 #include <cppuhelper/factory.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>

 namespace basic
 {

--- a/canvas/source/vcl/cachedbitmap.hxx
+++ b/canvas/source/vcl/cachedbitmap.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX

 #include <canvas/base/cachedprimitivebase.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <memory>



--- a/chart2/CppunitTest_chart2_dump.mk
+++ b/chart2/CppunitTest_chart2_dump.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_dump,\
    svx/util/svx \
    svx/util/svxcore \
    toolkit/util/tk \
+    vcl/vcl.common \
    ucb/source/core/ucb1 \
    ucb/source/ucp/file/ucpfile1 \
    ucb/source/ucp/tdoc/ucptdoc1 \

--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -116,6 +116,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\
    svx/util/svx \
    svx/util/svxcore \
    toolkit/util/tk \
+    vcl/vcl.common \
    ucb/source/core/ucb1 \
    ucb/source/ucp/file/ucpfile1 \
    ucb/source/ucp/tdoc/ucptdoc1 \

--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\
    svx/util/svx \
    svx/util/svxcore \
    toolkit/util/tk \
+    vcl/vcl.common \
    ucb/source/core/ucb1 \
    ucb/source/ucp/file/ucpfile1 \
    ucb/source/ucp/tdoc/ucptdoc1 \

--- a/chart2/CppunitTest_chart2_pivot_chart_test.mk
+++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk
@@ -113,6 +113,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_pivot_chart_test,\
    svx/util/svx \
    svx/util/svxcore \
    toolkit/util/tk \
+    vcl/vcl.common \
    ucb/source/core/ucb1 \
    ucb/source/ucp/file/ucpfile1 \
    ucb/source/ucp/tdoc/ucptdoc1 \

--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -113,6 +113,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\
    svx/util/svx \
    svx/util/svxcore \
    toolkit/util/tk \
+    vcl/vcl.common \
    ucb/source/core/ucb1 \
    ucb/source/ucp/file/ucpfile1 \
    ucb/source/ucp/tdoc/ucptdoc1 \

--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\
    svx/util/svx \
    svx/util/svxcore \
    toolkit/util/tk \
+    vcl/vcl.common \
    ucb/source/core/ucb1 \
    ucb/source/ucp/file/ucpfile1 \
    ucb/source/ucp/tdoc/ucptdoc1 \

--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -64,7 +64,7 @@
 #include <rtl/ref.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>

 #include <memory>


--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -430,7 +430,7 @@
 #include <svl/undo.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/controldims.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/toolboxcontroller.hxx>

--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -32,7 +32,7 @@

 #include <editeng/unoprnms.hxx>
 #include <vcl/graph.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/outdev.hxx>

 #include <comphelper/processfactory.hxx>

--- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
 	sd/util/sdd \
 	svl/source/fsstor/fsstorage \
 	toolkit/util/tk \
+	vcl/vcl.common \
 	ucb/source/core/ucb1 \
 	ucb/source/ucp/file/ucpfile1 \
 	unoxml/source/service/unoxml \

--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -142,6 +142,7 @@
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/help.hxx>
 #include <vcl/idle.hxx>
@@ -362,7 +363,6 @@
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
 #include <svtools/ehdl.hxx>
-#include <svtools/grfmgr.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/svtresid.hxx>

--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -34,7 +34,7 @@
 #include <vcl/idle.hxx>
 #include <svl/slstitm.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svx/galctrl.hxx>
 #include <svx/galmisc.hxx>

--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -27,7 +27,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
 #include <tools/helpers.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svx/graphctl.hxx>
 #include <svx/dlgctrl.hxx>
 #include <svx/rectenum.hxx>

--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -20,7 +20,7 @@
 #include <config_features.h>
 #include <svl/zforlist.hxx>
 #include <svl/currencytable.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svtools/langhelp.hxx>
 #include <svl/flagitem.hxx>
 #include <sfx2/dispatch.hxx>

--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -50,7 +50,7 @@
 #include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <comphelper/lok.hxx>

 using namespace css;

--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -84,7 +84,7 @@

 #include <list>

-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <tools/urlobj.hxx>

 using namespace ::com::sun::star::uno;

--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -32,7 +32,7 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/graph.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <callbacks.hxx>
 #include <memory>


--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_CppunitTest_use_components,desktop_lib,\
    ucb/source/ucp/file/ucpfile1 \
    unoxml/source/service/unoxml \
    uui/util/uui \
+    vcl/vcl.common \
    xmloff/util/xo \
    i18npool/source/search/i18nsearch \
    filter/source/graphic/graphicfilter \

--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -21,7 +21,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>

--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -50,7 +50,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <limits.h>
 #include <comphelper/processfactory.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/types.hxx>

--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -47,7 +47,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <editeng/svxfont.hxx>
 #include <editeng/brushitem.hxx>
 #include <svl/itempool.hxx>

--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>

 #include <editeng/brushitem.hxx>
 #include <editeng/unoprnms.hxx>

--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -45,7 +45,7 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svdxcgv.hxx>
 #include <svx/svdobj.hxx>

--- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx
@@ -24,7 +24,7 @@

 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>


 namespace drawinglayer

--- a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx
+++ b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx
@@ -21,7 +21,7 @@

 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>


 // predefines

--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -22,7 +22,7 @@
 #include <memory>
 #include <editeng/editengdllapi.h>
 #include <svl/poolitem.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/font.hxx>



--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -37,7 +37,7 @@
 #include <editeng/editengdllapi.h>
 #include <com/sun/star/lang/Locale.hpp>

-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>

 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
 #include <com/sun/star/uno/Reference.h>

--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -33,7 +33,7 @@
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svx/svdtypes.hxx>
 #include <svx/msdffdef.hxx>
 #include <tools/gen.hxx>

--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -33,7 +33,7 @@
 #include <svtools/transfer.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/brwbox.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svx/galmisc.hxx>
 #include <svx/svxdllapi.h>


--- a/include/svx/grfflt.hxx
+++ b/include/svx/grfflt.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_GRFFLT_HXX
 #define INCLUDED_SVX_GRFFLT_HXX

-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svx/svxdllapi.h>

 enum class SvxGraphicFilterResult {

--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_SDGMOITM_HXX
 #define INCLUDED_SVX_SDGMOITM_HXX

-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svxdllapi.h>

--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <vcl/graph.hxx>
 #include <svx/svdorect.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svx/svxdllapi.h>
 #include <o3tl/typed_flags_set.hxx>


--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <sal/types.h>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/fldunit.hxx>

--- a/include/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
@@ -23,7 +23,7 @@
 #include <memory>
 #include <tools/color.hxx>
 #include <vcl/bitmap.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svx/xenum.hxx>
 #include <svx/svxdllapi.h>


--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -22,7 +22,7 @@

 #include <svx/svxdllapi.h>
 #include <svx/xit.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <array>

 class SdrModel;

--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -22,7 +22,7 @@

 #include <cppuhelper/compbase.hxx>
 #include <osl/mutex.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vector>
 #include <set>
 #include <utility>

--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <svx/XPropertyEntry.hxx>

 #include <limits>

--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -17,12 +17,12 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#ifndef INCLUDED_SVTOOLS_GRFMGR_HXX
-#define INCLUDED_SVTOOLS_GRFMGR_HXX
+#ifndef INCLUDED_VCL_GRAPHICOBJECT_HXX
+#define INCLUDED_VCL_GRAPHICOBJECT_HXX

 #include <memory>
 #include <vcl/graph.hxx>
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>

 #include <unordered_set>
@@ -79,7 +79,7 @@ class VirtualDevice;
 struct GrfSimpleCacheObj;
 struct ImplTileInfo;

-class SVT_DLLPUBLIC GraphicAttr
+class VCL_DLLPUBLIC GraphicAttr
 {
 private:

@@ -165,7 +165,7 @@ public:
                    }
 };

-class SVT_DLLPUBLIC GraphicObject
+class VCL_DLLPUBLIC GraphicObject
 {
    friend class GraphicManager;
    friend class SdrGrafObj;
@@ -197,10 +197,10 @@ private:
    bool                    mbIsInSwapIn    : 1;
    bool                    mbIsInSwapOut   : 1;

-    void                    SVT_DLLPRIVATE ImplAssignGraphicData();
-    static void             SVT_DLLPRIVATE ImplEnsureGraphicManager();
-    void                    SVT_DLLPRIVATE ImplAutoSwapIn();
-    bool                    SVT_DLLPRIVATE ImplGetCropParams(
+    void                    VCL_DLLPRIVATE ImplAssignGraphicData();
+    static void             VCL_DLLPRIVATE ImplEnsureGraphicManager();
+    void                    VCL_DLLPRIVATE ImplAutoSwapIn();
+    bool                    VCL_DLLPRIVATE ImplGetCropParams(
                                OutputDevice const * pOut,
                                Point& rPt,
                                Size& rSz,
@@ -247,7 +247,7 @@ private:

        @return true, if everything was successfully rendered.
    */
-    bool SVT_DLLPRIVATE     ImplRenderTempTile(
+    bool VCL_DLLPRIVATE     ImplRenderTempTile(
                                VirtualDevice& rVDev,
                                int nNumTilesX,
                                int nNumTilesY,
@@ -257,7 +257,7 @@ private:
                            );

    /// internally called by ImplRenderTempTile()
-    bool SVT_DLLPRIVATE     ImplRenderTileRecursive(
+    bool VCL_DLLPRIVATE     ImplRenderTileRecursive(
                                VirtualDevice& rVDev,
                                int nExponent,
                                int nMSBFactor,
@@ -271,7 +271,7 @@ private:
                                ImplTileInfo& rTileInfo
                            );

-    bool SVT_DLLPRIVATE     ImplDrawTiled(
+    bool VCL_DLLPRIVATE     ImplDrawTiled(
                                OutputDevice* pOut,
                                const tools::Rectangle& rArea,
                                const Size& rSizePixel,
@@ -281,7 +281,7 @@ private:
                                int nTileCacheSize1D
                            );

-    bool SVT_DLLPRIVATE     ImplDrawTiled(
+    bool VCL_DLLPRIVATE     ImplDrawTiled(
                                OutputDevice& rOut,
                                const Point& rPos,
                                int nNumTilesX,
@@ -291,7 +291,7 @@ private:
                                GraphicManagerDrawFlags nFlags
                            );

-    void SVT_DLLPRIVATE     ImplTransformBitmap(
+    void VCL_DLLPRIVATE     ImplTransformBitmap(
                                BitmapEx&           rBmpEx,
                                const GraphicAttr&  rAttr,
                                const Size&         rCropLeftTop,
@@ -305,7 +305,7 @@ private:

    // Handle evtl. needed AfterDataChanges, needs to be called when new
    // graphic data is swapped in/added to the GraphicManager
-    void SVT_DLLPRIVATE     ImplAfterDataChange();
+    void VCL_DLLPRIVATE     ImplAfterDataChange();
 protected:

    SvStream*               GetSwapStream() const;
@@ -487,7 +487,7 @@ public:
    sal_uLong GetDataChangeTimeStamp() const { return mnDataChangeTimeStamp; }
 };

-class SVT_DLLPUBLIC GraphicManager
+class VCL_DLLPUBLIC GraphicManager
 {
    friend class GraphicObject;
    friend class GraphicDisplayCacheEntry;
@@ -501,7 +501,7 @@ private:
                        GraphicManager( const GraphicManager& ) = delete;
    GraphicManager&     operator=( const GraphicManager& ) = delete;

-    bool SVT_DLLPRIVATE ImplDraw(
+    bool VCL_DLLPRIVATE ImplDraw(
                            OutputDevice* pOut,
                            const Point& rPt,
                            const Size& rSz,
@@ -510,7 +510,7 @@ private:
                            bool& rCached
                        );

-    static bool SVT_DLLPRIVATE ImplCreateOutput(
+    static bool VCL_DLLPRIVATE ImplCreateOutput(
                            OutputDevice* pOut,
                            const Point& rPt,
                            const Size& rSz,
@@ -518,7 +518,7 @@ private:
                            const GraphicAttr& rAttr,
                            BitmapEx* pBmpEx = nullptr
                        );
-    static bool SVT_DLLPRIVATE ImplCreateOutput(
+    static bool VCL_DLLPRIVATE ImplCreateOutput(
                            OutputDevice* pOut,
                            const Point& rPt,
                            const Size& rSz,
@@ -528,23 +528,23 @@ private:
                            BitmapEx& rOutBmpEx
                        );

-    static void SVT_DLLPRIVATE ImplAdjust(
+    static void VCL_DLLPRIVATE ImplAdjust(
                            BitmapEx& rBmpEx,
                            const GraphicAttr& rAttr,
                            GraphicAdjustmentFlags nAdjustmentFlags
                        );
-    static void SVT_DLLPRIVATE ImplAdjust(
+    static void VCL_DLLPRIVATE ImplAdjust(
                            GDIMetaFile& rMtf,
                            const GraphicAttr& rAttr,
                            GraphicAdjustmentFlags nAdjustmentFlags
                        );
-    static void SVT_DLLPRIVATE ImplAdjust(
+    static void VCL_DLLPRIVATE ImplAdjust(
                            Animation& rAnimation,
                            const GraphicAttr& rAttr,
                            GraphicAdjustmentFlags nAdjustmentFlags
                        );

-    static void SVT_DLLPRIVATE ImplDraw(
+    static void VCL_DLLPRIVATE ImplDraw(
                            OutputDevice* pOut,
                            const Point& rPt,
                            const Size& rSz,
@@ -553,20 +553,20 @@ private:
                        );

                    // Only used by GraphicObject's Ctor's and Dtor's
-    void SVT_DLLPRIVATE ImplRegisterObj(
+    void VCL_DLLPRIVATE ImplRegisterObj(
                            const GraphicObject& rObj,
                            Graphic& rSubstitute,
                            const OString* pID,
                            const GraphicObject* pCopyObj
                        );
-    void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj );
-    bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); }
+    void VCL_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj );
+    bool VCL_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); }

                    // Only used in swap case by GraphicObject
-    void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj );
-    void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj );
+    void VCL_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj );
+    void VCL_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj );

-    OString SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const;
+    OString VCL_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const;

    // This method allows to check memory footprint for all currently swapped in GraphicObjects on this GraphicManager
    // which are based on Bitmaps. This is needed on 32Bit systems and only does something on those systems. The problem
@@ -575,7 +575,7 @@ private:
    // For 32Bit systems this leads to situations where graphics will be missing. This method will actively swap out
    // the longest swapped in graphics until a maximum memory boundary (derived from user settings in tools/options/memory)
    // is no longer exceeded
-    void SVT_DLLPRIVATE ImplCheckSizeOfSwappedInGraphics(const GraphicObject* pGraphicToIgnore);
+    void VCL_DLLPRIVATE ImplCheckSizeOfSwappedInGraphics(const GraphicObject* pGraphicToIgnore);
 public:

                        GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize );
@@ -605,6 +605,6 @@ public:
                        );
 };

-#endif // INCLUDED_SVTOOLS_GRFMGR_HXX
+#endif // INCLUDED_VCL_GRAPHICOBJECT_HXX

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/include/vcl/dllapi.h
+++ b/include/vcl/dllapi.h
@@ -28,6 +28,7 @@
 #else
 #define VCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
+#define VCL_DLLPRIVATE SAL_DLLPRIVATE

 #if defined DLLIMPLEMENTATION_UITEST
 #define UITEST_DLLPUBLIC SAL_DLLPUBLIC_EXPORT

--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -86,7 +86,7 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/settings.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>

--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -89,7 +89,7 @@
 #include <unotools/fontcvt.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>

--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	unoxml/source/rdf/unordf \
 	unoxml/source/service/unoxml \
 	uui/util/uui \
+	vcl/vcl.common \
 	xmloff/source/transform/xof \
 	xmloff/util/xo \
 	xmlscript/util/xmlscript \

--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -132,6 +132,7 @@
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/inputctx.hxx>
 #include <vcl/inputtypes.hxx>
@@ -296,7 +297,6 @@
 #include <svl/style.hxx>
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
-#include <svtools/grfmgr.hxx>
 #include <svtools/svtdllapi.h>
 #include <svx/XPropertyEntry.hxx>
 #include <svx/sdmetitm.hxx>

--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -145,6 +145,7 @@
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/image.hxx>
@@ -436,7 +437,6 @@
 #include <svtools/accessibilityoptions.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/framestatuslistener.hxx>
-#include <svtools/grfmgr.hxx>
 #include <svtools/headbar.hxx>