[Libreoffice-commits] core.git: basctl/inc basic/source canvas/source chart2/CppunitTest_chart2_dump.mk chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk chart2/CppunitTest_chart2_pivot_chart_test.mk chart2/CppunitTest_chart2_trendcalculators.mk chart2/CppunitTest_chart2_xshape.mk chart2/inc chart2/source cppcanvas/CppunitTest_cppcanvas_emfplus.mk cui/inc cui/source dbaccess/source desktop/CppunitTest_desktop_lib.mk drawinglayer/source editeng/source filter/source include/drawinglayer include/editeng include/filter include/svtools include/svx include/vcl oox/source postprocess/Rdb_services.mk reportdesign/inc sc/CppunitTest_sc_addin_functions_test.mk sc/CppunitTest_sc_anchor_test.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTest_sc_arealinkobj.mk sc/CppunitTest_sc_arealinksobj.mk sc/CppunitTest_sc_array_functions_test.mk sc/CppunitTest_sc_autoformatobj.mk sc/CppunitTest_sc_bugfix_test.mk sc/Cppuni tTest_sc_cache_test.mk sc/CppunitTest_sc_cellcursorobj.mk sc/CppunitTest_sc_cellobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_cellrangesobj.mk sc/CppunitTest_sc_chart2dataprovider.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_check_data_pilot_field.mk sc/CppunitTest_sc_check_data_pilot_table.mk sc/CppunitTest_sc_check_xcell_ranges_query.mk sc/CppunitTest_sc_cond_format_merge.mk sc/CppunitTest_sc_consolidationdescriptorobj.mk sc/CppunitTest_sc_copypaste.mk sc/CppunitTest_sc_database_functions_test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_databaserangesobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilotitemobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_datapilottablesobj.mk sc/CppunitTest_sc_dataprovider.mk sc/CppunitTest_sc_datatransformation.mk sc/CppunitTest_sc_datetime_functions_test.mk sc/CppunitTest_sc_documentconfigurationobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfi eldobj_header.mk sc/CppunitTest_sc_filterdescriptorbaseobj.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_financial_functions_test.mk sc/CppunitTest_sc_functionlistobj.mk sc/CppunitTest_sc_functions_test_old.mk sc/CppunitTest_sc_headerfootercontentobj.mk sc/CppunitTest_sc_html_export_test.mk sc/CppunitTest_sc_importdescriptorbaseobj.mk sc/CppunitTest_sc_information_functions_test.mk sc/CppunitTest_sc_labelrangeobj.mk sc/CppunitTest_sc_labelrangesobj.mk sc/CppunitTest_sc_logical_functions_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_mark_test.mk sc/CppunitTest_sc_mathematical_functions_test.mk sc/CppunitTest_sc_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_new_cond_format_api.mk sc/CppunitTest_sc_opencl_test.mk sc/CppunitTest_sc_outlineobj.mk sc/CppunitTest_sc_parallelism.mk sc/CppunitTest_sc_pivottable_filters_test.mk sc/CppunitTest_sc_rangelst_test.mk sc/CppunitTest_sc_range_test.mk sc/CppunitTest_sc_recen tfunctionsobj.mk sc/CppunitTest_sc_recordchanges.mk sc/CppunitTest_sc_scenariosobj.mk sc/CppunitTest_sc_shapeobj.mk sc/CppunitTest_sc_sheetlinkobj.mk sc/CppunitTest_sc_spreadsheet_functions_test.mk sc/CppunitTest_sc_spreadsheetsettingsobj.mk sc/CppunitTest_sc_statistical_functions_test.mk sc/CppunitTest_sc_styleloaderobj.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk sc/CppunitTest_sc_subtotalfieldobj.mk sc/CppunitTest_sc_tableconditionalentryobj.mk sc/CppunitTest_sc_tableconditionalformatobj.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_tablevalidationobj.mk sc/CppunitTest_sc_tabviewobj.mk sc/CppunitTest_sc_text_functions_test.mk sc/CppunitTest_sc_ucalc.mk sc/CppunitTest_sc_viewpaneobj.mk sc/inc sd/CppunitTest_sd_activex_controls_tests.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_html_export_tests.mk sd/CppunitTest_sd_import_tests.mk sd /CppunitTest_sd_import_tests_smartart.mk sd/CppunitTest_sd_misc_tests.mk sd/inc slideshow/source solenv/bin solenv/clang-format svtools/inc svtools/Library_svt.mk svtools/qa svtools/source svtools/util svx/inc svx/source sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_htmlexport.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_mailmerge.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_ooxmlexport8.mk sw/CppunitTest_sw_ooxmlimport.mk sw/CppunitTest_sw_rtfimport.mk sw/CppunitTest_sw_ww8export2.mk sw/CppunitTest_sw_ww8export.mk sw/CppunitTest_sw_ww8import.mk sw/inc sw/ooxmlexport_setup.mk sw/source vcl/Library_vcl.mk vcl/source vcl/vcl.common.component writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.co.uk
Sun Mar 11 12:39:45 UTC 2018
basctl/inc/pch/precompiled_basctl.hxx | 2
basic/source/uno/dlgcont.cxx | 2
canvas/source/vcl/cachedbitmap.hxx | 2
chart2/CppunitTest_chart2_dump.mk | 1
chart2/CppunitTest_chart2_export.mk | 1
chart2/CppunitTest_chart2_import.mk | 1
chart2/CppunitTest_chart2_pivot_chart_test.mk | 1
chart2/CppunitTest_chart2_trendcalculators.mk | 1
chart2/CppunitTest_chart2_xshape.mk | 1
chart2/inc/ChartModel.hxx | 2
chart2/inc/pch/precompiled_chartcontroller.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 2
cppcanvas/CppunitTest_cppcanvas_emfplus.mk | 1
cui/inc/pch/precompiled_cui.hxx | 2
cui/source/inc/cuigaldlg.hxx | 2
cui/source/inc/cuigrfflt.hxx | 2
cui/source/options/optgdlg.cxx | 2
cui/source/tabpages/backgrnd.cxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2
desktop/CppunitTest_desktop_lib.mk | 1
drawinglayer/source/primitive2d/mediaprimitive2d.cxx | 2
editeng/source/items/frmitems.cxx | 2
editeng/source/outliner/outliner.cxx | 2
editeng/source/uno/unonrule.cxx | 2
filter/source/svg/svgfilter.hxx | 2
include/drawinglayer/primitive2d/graphicprimitive2d.hxx | 2
include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx | 2
include/editeng/bulletitem.hxx | 2
include/editeng/outliner.hxx | 2
include/filter/msfilter/escherex.hxx | 2
include/svx/galctrl.hxx | 2
include/svx/grfflt.hxx | 2
include/svx/sdgmoitm.hxx | 2
include/svx/svdograf.hxx | 2
include/svx/unoapi.hxx | 2
include/svx/xbitmap.hxx | 2
include/svx/xbtmpit.hxx | 2
include/svx/xmlgrhlp.hxx | 2
include/svx/xtable.hxx | 2
include/vcl/GraphicObject.hxx | 62 +++++-----
include/vcl/dllapi.h | 1
oox/source/export/drawingml.cxx | 2
oox/source/export/shapes.cxx | 2
postprocess/Rdb_services.mk | 1
reportdesign/inc/pch/precompiled_rpt.hxx | 2
reportdesign/inc/pch/precompiled_rptui.hxx | 2
sc/CppunitTest_sc_addin_functions_test.mk | 1
sc/CppunitTest_sc_anchor_test.mk | 1
sc/CppunitTest_sc_annotationobj.mk | 1
sc/CppunitTest_sc_annotationshapeobj.mk | 1
sc/CppunitTest_sc_annotationsobj.mk | 1
sc/CppunitTest_sc_arealinkobj.mk | 3
sc/CppunitTest_sc_arealinksobj.mk | 3
sc/CppunitTest_sc_array_functions_test.mk | 1
sc/CppunitTest_sc_autoformatobj.mk | 1
sc/CppunitTest_sc_bugfix_test.mk | 1
sc/CppunitTest_sc_cache_test.mk | 1
sc/CppunitTest_sc_cellcursorobj.mk | 1
sc/CppunitTest_sc_cellobj.mk | 2
sc/CppunitTest_sc_cellrangeobj.mk | 1
sc/CppunitTest_sc_cellrangesobj.mk | 1
sc/CppunitTest_sc_chart2dataprovider.mk | 1
sc/CppunitTest_sc_chart_regression_test.mk | 1
sc/CppunitTest_sc_check_data_pilot_field.mk | 3
sc/CppunitTest_sc_check_data_pilot_table.mk | 3
sc/CppunitTest_sc_check_xcell_ranges_query.mk | 1
sc/CppunitTest_sc_cond_format_merge.mk | 1
sc/CppunitTest_sc_consolidationdescriptorobj.mk | 1
sc/CppunitTest_sc_copypaste.mk | 1
sc/CppunitTest_sc_database_functions_test.mk | 1
sc/CppunitTest_sc_databaserangeobj.mk | 1
sc/CppunitTest_sc_databaserangesobj.mk | 1
sc/CppunitTest_sc_datapilotfieldobj.mk | 1
sc/CppunitTest_sc_datapilotitemobj.mk | 1
sc/CppunitTest_sc_datapilottableobj.mk | 1
sc/CppunitTest_sc_datapilottablesobj.mk | 1
sc/CppunitTest_sc_dataprovider.mk | 1
sc/CppunitTest_sc_datatransformation.mk | 1
sc/CppunitTest_sc_datetime_functions_test.mk | 1
sc/CppunitTest_sc_documentconfigurationobj.mk | 1
sc/CppunitTest_sc_editfieldobj_cell.mk | 1
sc/CppunitTest_sc_editfieldobj_header.mk | 1
sc/CppunitTest_sc_filterdescriptorbaseobj.mk | 1
sc/CppunitTest_sc_filters_test.mk | 1
sc/CppunitTest_sc_financial_functions_test.mk | 1
sc/CppunitTest_sc_functionlistobj.mk | 1
sc/CppunitTest_sc_functions_test_old.mk | 1
sc/CppunitTest_sc_headerfootercontentobj.mk | 1
sc/CppunitTest_sc_html_export_test.mk | 1
sc/CppunitTest_sc_importdescriptorbaseobj.mk | 1
sc/CppunitTest_sc_information_functions_test.mk | 1
sc/CppunitTest_sc_labelrangeobj.mk | 1
sc/CppunitTest_sc_labelrangesobj.mk | 1
sc/CppunitTest_sc_logical_functions_test.mk | 1
sc/CppunitTest_sc_macros_test.mk | 1
sc/CppunitTest_sc_mark_test.mk | 1
sc/CppunitTest_sc_mathematical_functions_test.mk | 1
sc/CppunitTest_sc_modelobj.mk | 1
sc/CppunitTest_sc_namedrangeobj.mk | 1
sc/CppunitTest_sc_namedrangesobj.mk | 1
sc/CppunitTest_sc_new_cond_format_api.mk | 1
sc/CppunitTest_sc_opencl_test.mk | 1
sc/CppunitTest_sc_outlineobj.mk | 1
sc/CppunitTest_sc_parallelism.mk | 1
sc/CppunitTest_sc_pivottable_filters_test.mk | 3
sc/CppunitTest_sc_range_test.mk | 1
sc/CppunitTest_sc_rangelst_test.mk | 1
sc/CppunitTest_sc_recentfunctionsobj.mk | 1
sc/CppunitTest_sc_recordchanges.mk | 1
sc/CppunitTest_sc_scenariosobj.mk | 1
sc/CppunitTest_sc_shapeobj.mk | 1
sc/CppunitTest_sc_sheetlinkobj.mk | 1
sc/CppunitTest_sc_spreadsheet_functions_test.mk | 1
sc/CppunitTest_sc_spreadsheetsettingsobj.mk | 1
sc/CppunitTest_sc_statistical_functions_test.mk | 1
sc/CppunitTest_sc_styleloaderobj.mk | 1
sc/CppunitTest_sc_subsequent_export_test.mk | 1
sc/CppunitTest_sc_subsequent_filters_test.mk | 1
sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk | 1
sc/CppunitTest_sc_subtotalfieldobj.mk | 1
sc/CppunitTest_sc_tableconditionalentryobj.mk | 1
sc/CppunitTest_sc_tableconditionalformatobj.mk | 1
sc/CppunitTest_sc_tablesheetobj.mk | 1
sc/CppunitTest_sc_tablesheetsobj.mk | 1
sc/CppunitTest_sc_tablevalidationobj.mk | 1
sc/CppunitTest_sc_tabviewobj.mk | 1
sc/CppunitTest_sc_text_functions_test.mk | 1
sc/CppunitTest_sc_ucalc.mk | 1
sc/CppunitTest_sc_viewpaneobj.mk | 1
sc/inc/pch/precompiled_sc.hxx | 2
sc/inc/pch/precompiled_scfilt.hxx | 2
sd/CppunitTest_sd_activex_controls_tests.mk | 3
sd/CppunitTest_sd_filters_test.mk | 1
sd/CppunitTest_sd_html_export_tests.mk | 1
sd/CppunitTest_sd_import_tests.mk | 1
sd/CppunitTest_sd_import_tests_smartart.mk | 1
sd/CppunitTest_sd_misc_tests.mk | 1
sd/inc/pch/precompiled_sdui.hxx | 2
slideshow/source/engine/shapes/shapeimporter.cxx | 2
solenv/bin/native-code.py | 2
solenv/clang-format/blacklist | 28 ++--
svtools/Library_svt.mk | 9 -
svtools/inc/pch/precompiled_svt.hxx | 2
svtools/qa/unit/GraphicObjectTest.cxx | 2
svtools/source/graphic/renderer.cxx | 11 -
svtools/util/svt.component | 8 -
svx/inc/pch/precompiled_svx.hxx | 2
svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx | 2
svx/source/core/extedit.cxx | 2
svx/source/svdraw/svdograf.cxx | 4
svx/source/svdraw/svdpntv.cxx | 2
sw/CppunitTest_sw_filters_test.mk | 1
sw/CppunitTest_sw_htmlexport.mk | 1
sw/CppunitTest_sw_macros_test.mk | 1
sw/CppunitTest_sw_mailmerge.mk | 1
sw/CppunitTest_sw_odfimport.mk | 1
sw/CppunitTest_sw_ooxmlexport8.mk | 1
sw/CppunitTest_sw_ooxmlimport.mk | 1
sw/CppunitTest_sw_rtfimport.mk | 1
sw/CppunitTest_sw_ww8export.mk | 1
sw/CppunitTest_sw_ww8export2.mk | 1
sw/CppunitTest_sw_ww8import.mk | 1
sw/inc/grfatr.hxx | 2
sw/inc/ndgrf.hxx | 4
sw/inc/pch/precompiled_msword.hxx | 2
sw/inc/pch/precompiled_sw.hxx | 2
sw/inc/pch/precompiled_swui.hxx | 2
sw/ooxmlexport_setup.mk | 1
sw/source/core/graphic/grfatr.cxx | 2
sw/source/core/layout/atrfrm.cxx | 2
sw/source/filter/xml/xmlbrsh.cxx | 2
sw/source/uibase/utlui/attrdesc.cxx | 2
vcl/Library_vcl.mk | 11 +
vcl/source/graphic/GraphicObject.cxx | 2
vcl/source/graphic/GraphicObject2.cxx | 2
vcl/source/graphic/UnoGraphic.cxx | 2
vcl/source/graphic/UnoGraphic.hxx | 8 -
vcl/source/graphic/UnoGraphicDescriptor.cxx | 2
vcl/source/graphic/UnoGraphicDescriptor.hxx | 4
vcl/source/graphic/UnoGraphicObject.cxx | 2
vcl/source/graphic/UnoGraphicProvider.cxx | 6
vcl/source/graphic/UnoGraphicTransformer.cxx | 16 --
vcl/source/graphic/UnoGraphicTransformer.hxx | 4
vcl/source/graphic/grfattr.cxx | 2
vcl/source/graphic/grfcache.cxx | 2
vcl/source/graphic/grfcache.hxx | 6
vcl/vcl.common.component | 30 ++++
writerfilter/CppunitTest_writerfilter_rtftok.mk | 3
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
190 files changed, 294 insertions(+), 170 deletions(-)
New commits:
commit 7fbb96c2fbf99c47eca6f493f54fc3974f55cf86
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Sun Mar 11 11:16:34 2018 +0900
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/51068
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index ff365de77e51..ae77ead0b697 100644
--- 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>
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 5e3fd9c7995d..ac347db045de 100644
--- 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
{
diff --git a/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx
index d183fff9d93c..7d2878f10aab 100644
--- 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>
diff --git a/chart2/CppunitTest_chart2_dump.mk b/chart2/CppunitTest_chart2_dump.mk
index a5d7ce8fdaa1..3eb7d06a4cf8 100755
--- 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 \
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index f51ed51d33f2..647814ed4fc4 100644
--- 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 \
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index 17769c6e5173..18c264bbc615 100644
--- 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 \
diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk b/chart2/CppunitTest_chart2_pivot_chart_test.mk
index 4ca93e2be0ec..960c0a511b76 100644
--- 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 \
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk
index aa9a6d6b037e..afbb7c0ef9b4 100644
--- 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 \
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index 2efd810d932a..9e048bce96fe 100644
--- 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 \
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 191533418943..83dca2872772 100644
--- 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>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index f92d298d8238..1131205f270f 100644
--- 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>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index aec0eb3b6352..d9aa1f0fdc67 100644
--- 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>
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
index 7397af3b0610..ee47d8af0a18 100644
--- 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 \
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index cfebfb9ccc5a..6df4a6862268 100644
--- 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>
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 7c6cda281bec..1aeaa2e6be6d 100644
--- 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>
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index d4b7b085bb92..9daa44d02fba 100644
--- 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>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 90661cbecede..8aa4c78a12d9 100644
--- 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>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 59b1d6060797..36f46778a6aa 100644
--- 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;
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 6d50cc1faa16..b8c15f49df88 100644
--- 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;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 096f6045f65d..96eac41b0272 100644
--- 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>
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index 7f7a7c77c88b..504af1d0b5c8 100644
--- 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 \
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index 9f95f62ca7e7..f27d6fe1f49f 100644
--- 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>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index e49ad5d79572..85790110bc78 100644
--- 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>
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index e3ed742d0e79..64f0dc4e4816 100644
--- 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>
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 25a52303fc57..7f97607c1f99 100644
--- 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>
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index c85249d4e4c7..9ce3cb202b53 100644
--- 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>
diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx
index 34b1fc315268..b3127145be19 100644
--- 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
diff --git a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx
index 541168184b88..8eb3c43918e1 100644
--- 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
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index ddcbb28ddf89..012138c3b7ca 100644
--- 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>
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 43d6f99a8e62..5ef2a56ac05c 100644
--- 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>
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 82880496a948..d9f83294b5a7 100644
--- 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>
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 1ca339904fb8..953b53c18490 100644
--- 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>
diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx
index b3896c0e1387..2600ee999c8c 100644
--- 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 {
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index 7e508e16cabd..e17149102821 100644
--- 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>
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index abea8f1b222e..65b934847489 100644
--- 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>
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 8000220b2940..9c019a5a83a2 100644
--- 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>
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index e062a0aebc5a..3f817cd4b0a5 100644
--- 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>
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index 7c2e2fa2582c..2f8e5f1181ee 100644
--- 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;
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 578b9a5f98fb..79d9123a58ef 100644
--- 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>
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 1012303e0586..e83155a0f5de 100644
--- 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>
diff --git a/include/svtools/grfmgr.hxx b/include/vcl/GraphicObject.hxx
similarity index 94%
rename from include/svtools/grfmgr.hxx
rename to include/vcl/GraphicObject.hxx
index c2c70256ceaa..3025b48fee05 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/vcl/GraphicObject.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: */
diff --git a/include/vcl/dllapi.h b/include/vcl/dllapi.h
index 0187fa04d115..b85e2ab87ce5 100644
--- 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
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0398ce49ea78..931f77e91a31 100644
--- 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>
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 6a2706693611..97e1368f4368 100644
--- 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>
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index a0308656e695..5fcd89c7d1c4 100644
--- 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 \
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx
index 500aaf0b8ad5..56cad9c80450 100644
--- 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>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 3d6dbb15c71e..46537e6b5607 100644
--- 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>
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/statusbarcontroller.hxx>
diff --git a/sc/CppunitTest_sc_addin_functions_test.mk b/sc/CppunitTest_sc_addin_functions_test.mk
index b1aa766679be..2b17d33b793d 100644
--- a/sc/CppunitTest_sc_addin_functions_test.mk
+++ b/sc/CppunitTest_sc_addin_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_addin_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_anchor_test.mk b/sc/CppunitTest_sc_anchor_test.mk
index 2f9719e48fd6..480149c7ecd5 100644
--- a/sc/CppunitTest_sc_anchor_test.mk
+++ b/sc/CppunitTest_sc_anchor_test.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_anchor_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index 7dbd3c377330..a04c1cc104bb 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index eb720ce0bcb4..dc59ebb9481c 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationshapeobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index e606242f9fa2..504bbf5764cc 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_arealinkobj.mk b/sc/CppunitTest_sc_arealinkobj.mk
index 042672f6e605..9220a11e6721 100644
--- a/sc/CppunitTest_sc_arealinkobj.mk
+++ b/sc/CppunitTest_sc_arealinkobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_arealinkobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
@@ -103,5 +104,3 @@ $(eval $(call gb_CppunitTest_use_components,sc_arealinkobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_arealinkobj))
# vim: set noet sw=4 ts=4:
-
-
diff --git a/sc/CppunitTest_sc_arealinksobj.mk b/sc/CppunitTest_sc_arealinksobj.mk
index dead8dfb28bd..436472ebcbdb 100644
--- a/sc/CppunitTest_sc_arealinksobj.mk
+++ b/sc/CppunitTest_sc_arealinksobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_arealinksobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
@@ -103,5 +104,3 @@ $(eval $(call gb_CppunitTest_use_components,sc_arealinksobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_arealinksobj))
# vim: set noet sw=4 ts=4:
-
-
diff --git a/sc/CppunitTest_sc_array_functions_test.mk b/sc/CppunitTest_sc_array_functions_test.mk
index c94b75a7b203..a00e61325459 100644
--- a/sc/CppunitTest_sc_array_functions_test.mk
+++ b/sc/CppunitTest_sc_array_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_array_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_autoformatobj.mk b/sc/CppunitTest_sc_autoformatobj.mk
index 76b93534de7f..adad0b9122f7 100644
--- a/sc/CppunitTest_sc_autoformatobj.mk
+++ b/sc/CppunitTest_sc_autoformatobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_autoformatobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index 7a5d5825d1d8..aeac28ee5bff 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_bugfix_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sc/CppunitTest_sc_cache_test.mk b/sc/CppunitTest_sc_cache_test.mk
index af495db849d9..1a1cd671207e 100644
--- a/sc/CppunitTest_sc_cache_test.mk
+++ b/sc/CppunitTest_sc_cache_test.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cache_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_cellcursorobj.mk b/sc/CppunitTest_sc_cellcursorobj.mk
index fd2a0e874d5f..db57eaced17c 100644
--- a/sc/CppunitTest_sc_cellcursorobj.mk
+++ b/sc/CppunitTest_sc_cellcursorobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellcursorobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_cellobj.mk b/sc/CppunitTest_sc_cellobj.mk
index 62183c32b4c9..b519c31c6ccc 100644
--- a/sc/CppunitTest_sc_cellobj.mk
+++ b/sc/CppunitTest_sc_cellobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
@@ -103,4 +104,3 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_cellobj))
# vim: set noet sw=4 ts=4:
-
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 1ac628931f28..77e39b8b4d37 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangeobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_cellrangesobj.mk b/sc/CppunitTest_sc_cellrangesobj.mk
index 792f0dac3334..2cd5f055ac40 100644
--- a/sc/CppunitTest_sc_cellrangesobj.mk
+++ b/sc/CppunitTest_sc_cellrangesobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_chart2dataprovider.mk b/sc/CppunitTest_sc_chart2dataprovider.mk
index 7ef131b7f147..d802a17c2024 100644
--- a/sc/CppunitTest_sc_chart2dataprovider.mk
+++ b/sc/CppunitTest_sc_chart2dataprovider.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart2dataprovider,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 1a00137c0a85..d1e0ef8bfffa 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_check_data_pilot_field.mk b/sc/CppunitTest_sc_check_data_pilot_field.mk
index 59825d028bd9..4fbca0c09695 100644
--- a/sc/CppunitTest_sc_check_data_pilot_field.mk
+++ b/sc/CppunitTest_sc_check_data_pilot_field.mk
@@ -95,7 +95,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_check_data_pilot_field,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
- svtools/util/svt \
+ vcl/vcl.common \
+ svtools/util/svt \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_check_data_pilot_field))
diff --git a/sc/CppunitTest_sc_check_data_pilot_table.mk b/sc/CppunitTest_sc_check_data_pilot_table.mk
index 9f3f4209604d..9c337f4b2c69 100644
--- a/sc/CppunitTest_sc_check_data_pilot_table.mk
+++ b/sc/CppunitTest_sc_check_data_pilot_table.mk
@@ -95,7 +95,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_check_data_pilot_table,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
- svtools/util/svt \
+ vcl/vcl.common \
+ svtools/util/svt \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_check_data_pilot_table))
diff --git a/sc/CppunitTest_sc_check_xcell_ranges_query.mk b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
index 33c448dbebf1..9e12c800dbdc 100644
--- a/sc/CppunitTest_sc_check_xcell_ranges_query.mk
+++ b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
@@ -92,6 +92,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_check_xcell_ranges_query,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_cond_format_merge.mk b/sc/CppunitTest_sc_cond_format_merge.mk
index bfb7dc2bba3f..429010e6e40f 100644
--- a/sc/CppunitTest_sc_cond_format_merge.mk
+++ b/sc/CppunitTest_sc_cond_format_merge.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cond_format_merge,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_consolidationdescriptorobj.mk b/sc/CppunitTest_sc_consolidationdescriptorobj.mk
index 6ab04c3316f8..cd6e42d07f0d 100644
--- a/sc/CppunitTest_sc_consolidationdescriptorobj.mk
+++ b/sc/CppunitTest_sc_consolidationdescriptorobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_consolidationdescriptorobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk
index 8d71cf6004cf..b9a5eb66e027 100644
--- a/sc/CppunitTest_sc_copypaste.mk
+++ b/sc/CppunitTest_sc_copypaste.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_copypaste,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sc/CppunitTest_sc_database_functions_test.mk b/sc/CppunitTest_sc_database_functions_test.mk
index 8b9b9ac83625..401984182064 100644
--- a/sc/CppunitTest_sc_database_functions_test.mk
+++ b/sc/CppunitTest_sc_database_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_database_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index ff48e3c0a1f6..b4abe270037d 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_databaserangesobj.mk b/sc/CppunitTest_sc_databaserangesobj.mk
index 7b363575a896..237b9a79c31d 100644
--- a/sc/CppunitTest_sc_databaserangesobj.mk
+++ b/sc/CppunitTest_sc_databaserangesobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangesobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 1377f6615f5a..86126b6a98c7 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_datapilotitemobj.mk b/sc/CppunitTest_sc_datapilotitemobj.mk
index 77221eae63d6..8219d83e1856 100644
--- a/sc/CppunitTest_sc_datapilotitemobj.mk
+++ b/sc/CppunitTest_sc_datapilotitemobj.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotitemobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 3ba76c2c288e..b7cd344ff6a1 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_datapilottablesobj.mk b/sc/CppunitTest_sc_datapilottablesobj.mk
index 9da2198cad44..95a1c74be74b 100644
--- a/sc/CppunitTest_sc_datapilottablesobj.mk
+++ b/sc/CppunitTest_sc_datapilottablesobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottablesobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_dataprovider.mk b/sc/CppunitTest_sc_dataprovider.mk
index fe389fdb3ee5..90ea8cb4a452 100644
--- a/sc/CppunitTest_sc_dataprovider.mk
+++ b/sc/CppunitTest_sc_dataprovider.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_dataprovider,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sc/CppunitTest_sc_datatransformation.mk b/sc/CppunitTest_sc_datatransformation.mk
index b65d315bb944..3624e56d8109 100644
--- a/sc/CppunitTest_sc_datatransformation.mk
+++ b/sc/CppunitTest_sc_datatransformation.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datatransformation,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sc/CppunitTest_sc_datetime_functions_test.mk b/sc/CppunitTest_sc_datetime_functions_test.mk
index 560ae910f684..7534e4f50936 100644
--- a/sc/CppunitTest_sc_datetime_functions_test.mk
+++ b/sc/CppunitTest_sc_datetime_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datetime_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_documentconfigurationobj.mk b/sc/CppunitTest_sc_documentconfigurationobj.mk
index b393af10c7dc..1220e2b51c98 100644
--- a/sc/CppunitTest_sc_documentconfigurationobj.mk
+++ b/sc/CppunitTest_sc_documentconfigurationobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_documentconfigurationobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 04914a43fac1..4a665286d2a6 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -94,6 +94,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index ce1e529bc285..92c0e9951ece 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -94,6 +94,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_filterdescriptorbaseobj.mk b/sc/CppunitTest_sc_filterdescriptorbaseobj.mk
index 28cd6c7af67b..5e65bd0905c7 100644
--- a/sc/CppunitTest_sc_filterdescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_filterdescriptorbaseobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_filterdescriptorbaseobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 1f83822b107a..b2d837798f63 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_financial_functions_test.mk b/sc/CppunitTest_sc_financial_functions_test.mk
index 748c44b879b8..23d8054911ff 100644
--- a/sc/CppunitTest_sc_financial_functions_test.mk
+++ b/sc/CppunitTest_sc_financial_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_financial_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_functionlistobj.mk b/sc/CppunitTest_sc_functionlistobj.mk
index 959d53223823..43db1ca636ab 100644
--- a/sc/CppunitTest_sc_functionlistobj.mk
+++ b/sc/CppunitTest_sc_functionlistobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_functionlistobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_functions_test_old.mk b/sc/CppunitTest_sc_functions_test_old.mk
index cad0a6acf1bc..5113bf61c55e 100644
--- a/sc/CppunitTest_sc_functions_test_old.mk
+++ b/sc/CppunitTest_sc_functions_test_old.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_functions_test_old,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_headerfootercontentobj.mk b/sc/CppunitTest_sc_headerfootercontentobj.mk
index 485d1ade3540..431bcba67abb 100644
--- a/sc/CppunitTest_sc_headerfootercontentobj.mk
+++ b/sc/CppunitTest_sc_headerfootercontentobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_headerfootercontentobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk
index 08e7d04d4bf1..711d39d86771 100644
--- a/sc/CppunitTest_sc_html_export_test.mk
+++ b/sc/CppunitTest_sc_html_export_test.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_html_export_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
vbahelper/util/msforms \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_importdescriptorbaseobj.mk b/sc/CppunitTest_sc_importdescriptorbaseobj.mk
index 122b70ea2f3a..eb80b26ab6fc 100644
--- a/sc/CppunitTest_sc_importdescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_importdescriptorbaseobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_importdescriptorbaseobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_information_functions_test.mk b/sc/CppunitTest_sc_information_functions_test.mk
index 1c476bd6ac3b..b108339d087a 100644
--- a/sc/CppunitTest_sc_information_functions_test.mk
+++ b/sc/CppunitTest_sc_information_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_information_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_labelrangeobj.mk b/sc/CppunitTest_sc_labelrangeobj.mk
index 9a0944d76170..f02cd9b59662 100644
--- a/sc/CppunitTest_sc_labelrangeobj.mk
+++ b/sc/CppunitTest_sc_labelrangeobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_labelrangeobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_labelrangesobj.mk b/sc/CppunitTest_sc_labelrangesobj.mk
index 9c97e4c44ef3..28688667097d 100644
--- a/sc/CppunitTest_sc_labelrangesobj.mk
+++ b/sc/CppunitTest_sc_labelrangesobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_labelrangesobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_logical_functions_test.mk b/sc/CppunitTest_sc_logical_functions_test.mk
index ec2d07ea5f80..642e1e966eed 100644
--- a/sc/CppunitTest_sc_logical_functions_test.mk
+++ b/sc/CppunitTest_sc_logical_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_logical_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 9fa520e19a7d..b5e569ef7725 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -110,6 +110,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
vbahelper/util/msforms \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_mark_test.mk b/sc/CppunitTest_sc_mark_test.mk
index a37367b1d092..fb9f936d7e22 100644
--- a/sc/CppunitTest_sc_mark_test.mk
+++ b/sc/CppunitTest_sc_mark_test.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_mark_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_mathematical_functions_test.mk b/sc/CppunitTest_sc_mathematical_functions_test.mk
index 94e84e759edb..f3c14bc930fd 100644
--- a/sc/CppunitTest_sc_mathematical_functions_test.mk
+++ b/sc/CppunitTest_sc_mathematical_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_mathematical_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index d8ce3c528ad8..88f3697c024c 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index b18ba6c64569..0fc12d2b96c3 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 0b7c012c27ce..46bd69a716c2 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_new_cond_format_api.mk b/sc/CppunitTest_sc_new_cond_format_api.mk
index 8997b907e0f6..16484c10292c 100644
--- a/sc/CppunitTest_sc_new_cond_format_api.mk
+++ b/sc/CppunitTest_sc_new_cond_format_api.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_new_cond_format_api,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index 6abc275ec991..93925602e0d8 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_opencl_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index 6822d9f2b0ba..c325e811014f 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_parallelism.mk b/sc/CppunitTest_sc_parallelism.mk
index a411caee2ae2..bffa7b1bf8c2 100644
--- a/sc/CppunitTest_sc_parallelism.mk
+++ b/sc/CppunitTest_sc_parallelism.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_parallelism,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_pivottable_filters_test.mk b/sc/CppunitTest_sc_pivottable_filters_test.mk
index 139ed85f3b24..02c00e9beda7 100644
--- a/sc/CppunitTest_sc_pivottable_filters_test.mk
+++ b/sc/CppunitTest_sc_pivottable_filters_test.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_pivottable_filters_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
@@ -117,4 +118,4 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sc_pivottable_filters_test,\
$(eval $(call gb_CppunitTest_use_configuration,sc_pivottable_filters_test))
-# vim: set noet sw=4 ts=4:
\ No newline at end of file
+# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_range_test.mk b/sc/CppunitTest_sc_range_test.mk
index 9405142caa13..2a9ecc44434e 100644
--- a/sc/CppunitTest_sc_range_test.mk
+++ b/sc/CppunitTest_sc_range_test.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_range_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index b348105af8be..d3f8a18bcf6e 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sc/CppunitTest_sc_recentfunctionsobj.mk b/sc/CppunitTest_sc_recentfunctionsobj.mk
index 54f54501f025..85a918a7d7bd 100644
--- a/sc/CppunitTest_sc_recentfunctionsobj.mk
+++ b/sc/CppunitTest_sc_recentfunctionsobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_recentfunctionsobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_recordchanges.mk b/sc/CppunitTest_sc_recordchanges.mk
index e64f39a70afe..2afce187c9c0 100644
--- a/sc/CppunitTest_sc_recordchanges.mk
+++ b/sc/CppunitTest_sc_recordchanges.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_recordchanges,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_scenariosobj.mk b/sc/CppunitTest_sc_scenariosobj.mk
index 65c6f5e984e0..d88d3733a853 100644
--- a/sc/CppunitTest_sc_scenariosobj.mk
+++ b/sc/CppunitTest_sc_scenariosobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_scenariosobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_shapeobj.mk b/sc/CppunitTest_sc_shapeobj.mk
index a5939ac3814b..70dd8bf5458b 100644
--- a/sc/CppunitTest_sc_shapeobj.mk
+++ b/sc/CppunitTest_sc_shapeobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_shapeobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_sheetlinkobj.mk b/sc/CppunitTest_sc_sheetlinkobj.mk
index 34e1e8c326b0..013e70ebe5f2 100644
--- a/sc/CppunitTest_sc_sheetlinkobj.mk
+++ b/sc/CppunitTest_sc_sheetlinkobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_sheetlinkobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_spreadsheet_functions_test.mk b/sc/CppunitTest_sc_spreadsheet_functions_test.mk
index 6049862d5782..16713bcffc07 100644
--- a/sc/CppunitTest_sc_spreadsheet_functions_test.mk
+++ b/sc/CppunitTest_sc_spreadsheet_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheet_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_spreadsheetsettingsobj.mk b/sc/CppunitTest_sc_spreadsheetsettingsobj.mk
index bb658b1b2074..62ecad80a93f 100644
--- a/sc/CppunitTest_sc_spreadsheetsettingsobj.mk
+++ b/sc/CppunitTest_sc_spreadsheetsettingsobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsettingsobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_statistical_functions_test.mk b/sc/CppunitTest_sc_statistical_functions_test.mk
index 931c0b22ad86..436ac62885de 100644
--- a/sc/CppunitTest_sc_statistical_functions_test.mk
+++ b/sc/CppunitTest_sc_statistical_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_statistical_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_styleloaderobj.mk b/sc/CppunitTest_sc_styleloaderobj.mk
index 3a644acc5607..b6fd6bb8f902 100644
--- a/sc/CppunitTest_sc_styleloaderobj.mk
+++ b/sc/CppunitTest_sc_styleloaderobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_styleloaderobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index cf6125f6ef04..24d74d210fbb 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index e23869e164eb..b2454400a594 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk b/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
index 9966a7ddcedd..80eae20c787e 100644
--- a/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_subtotaldescriptorbaseobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_subtotalfieldobj.mk b/sc/CppunitTest_sc_subtotalfieldobj.mk
index 36800c349f46..e4e1a3619e01 100644
--- a/sc/CppunitTest_sc_subtotalfieldobj.mk
+++ b/sc/CppunitTest_sc_subtotalfieldobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_subtotalfieldobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_tableconditionalentryobj.mk b/sc/CppunitTest_sc_tableconditionalentryobj.mk
index b5e981ea9250..d7826af06eb8 100644
--- a/sc/CppunitTest_sc_tableconditionalentryobj.mk
+++ b/sc/CppunitTest_sc_tableconditionalentryobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableconditionalentryobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_tableconditionalformatobj.mk b/sc/CppunitTest_sc_tableconditionalformatobj.mk
index e55cdc365b0d..e8f6ddd3018a 100644
--- a/sc/CppunitTest_sc_tableconditionalformatobj.mk
+++ b/sc/CppunitTest_sc_tableconditionalformatobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableconditionalformatobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index c4347c083a9d..2c0445042e5d 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 334058881200..48a49b7c2b28 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_tablevalidationobj.mk b/sc/CppunitTest_sc_tablevalidationobj.mk
index c6807558064b..8826d8f43b5a 100644
--- a/sc/CppunitTest_sc_tablevalidationobj.mk
+++ b/sc/CppunitTest_sc_tablevalidationobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablevalidationobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_tabviewobj.mk b/sc/CppunitTest_sc_tabviewobj.mk
index f29a986b2643..ab5736d751fa 100644
--- a/sc/CppunitTest_sc_tabviewobj.mk
+++ b/sc/CppunitTest_sc_tabviewobj.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_tabviewobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/CppunitTest_sc_text_functions_test.mk b/sc/CppunitTest_sc_text_functions_test.mk
index 956b2b9d5aa1..58d183edfb73 100644
--- a/sc/CppunitTest_sc_text_functions_test.mk
+++ b/sc/CppunitTest_sc_text_functions_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_text_functions_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlscript/util/xmlscript \
))
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index d423f6c73a7b..48fb912c4335 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -105,6 +105,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
))
ifeq ($(OS),LINUX)
diff --git a/sc/CppunitTest_sc_viewpaneobj.mk b/sc/CppunitTest_sc_viewpaneobj.mk
index e1a7a2c21ffb..ca80372fa4dd 100644
--- a/sc/CppunitTest_sc_viewpaneobj.mk
+++ b/sc/CppunitTest_sc_viewpaneobj.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_viewpaneobj,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
svtools/util/svt \
))
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 2d86f4b9acbc..1e1a9f171301 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -143,6 +143,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
#include <vcl/inputctx.hxx>
@@ -493,7 +494,6 @@
#include <svl/zformat.hxx>
#include <svtools/colorcfg.hxx>
#include <svtools/framestatuslistener.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/svtdllapi.h>
#include <svtools/toolboxcontroller.hxx>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index d17d8dfd9c1a..ecedf0c8dc03 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -100,6 +100,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/image.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/outdev.hxx>
@@ -272,7 +273,6 @@
#include <svl/svldllapi.h>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/svtdllapi.h>
#include <svtools/transfer.hxx>
#include <svx/algitem.hxx>
diff --git a/sd/CppunitTest_sd_activex_controls_tests.mk b/sd/CppunitTest_sd_activex_controls_tests.mk
index 2b42afc1087b..0f8faf14c0c7 100755
--- a/sd/CppunitTest_sd_activex_controls_tests.mk
+++ b/sd/CppunitTest_sd_activex_controls_tests.mk
@@ -105,10 +105,11 @@ $(eval $(call gb_CppunitTest_use_components,sd_activex_controls_tests,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
$(eval $(call gb_CppunitTest_use_configuration,sd_activex_controls_tests))
-# vim: set noet sw=4 ts=4:
\ No newline at end of file
+# vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 66fa6f1b2cf7..430b31c39e0d 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk
index e041ef97e1fa..c6d2ff9a83f3 100644
--- a/sd/CppunitTest_sd_html_export_tests.mk
+++ b/sd/CppunitTest_sd_html_export_tests.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 12ad80637323..ca5fa508bf06 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -110,6 +110,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmlscript/util/xmlscript \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
diff --git a/sd/CppunitTest_sd_import_tests_smartart.mk b/sd/CppunitTest_sd_import_tests_smartart.mk
index de7c5fae2925..a35bea16422f 100755
--- a/sd/CppunitTest_sd_import_tests_smartart.mk
+++ b/sd/CppunitTest_sd_import_tests_smartart.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests_smartart,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index 8dec5f351fcc..5566bd3a090b 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -113,6 +113,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_misc_tests,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 769f7b360ad6..0935afd1be22 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -144,6 +144,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>
@@ -440,7 +441,6 @@
#include <svtools/ctrlbox.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/framestatuslistener.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/svtdllapi.h>
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 3f31fac1099a..6764fc717cfc 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -18,9 +18,9 @@
*/
#include <vcl/cvtgrf.hxx>
+#include <vcl/GraphicObject.hxx>
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
-#include <svtools/grfmgr.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b5f729b22434..b7481c15baa8 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -198,7 +198,7 @@ core_constructor_list = [
"com_sun_star_comp_uri_UriReferenceFactory_get_implementation",
"com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTexpand_get_implementation",
"com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTscript_get_implementation",
-# svtools/util/svt.component
+# vcl/vcl.android.component
"com_sun_star_graphic_GraphicObject_get_implementation",
"com_sun_star_comp_graphic_GraphicProvider_get_implementation",
# svx/util/svx.component
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index a8c7c1e945dc..2dfa7aec31eb 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7108,7 +7108,6 @@ include/svtools/fontsubstconfig.hxx
include/svtools/framestatuslistener.hxx
include/svtools/generictoolboxcontroller.hxx
include/svtools/genericunodialog.hxx
-include/svtools/grfmgr.hxx
include/svtools/headbar.hxx
include/svtools/helpids.h
include/svtools/helpopt.hxx
@@ -8024,6 +8023,7 @@ include/vcl/gdimtf.hxx
include/vcl/gfxlink.hxx
include/vcl/gradient.hxx
include/vcl/graph.hxx
+include/vcl/GraphicObject.hxx
include/vcl/graphicfilter.hxx
include/vcl/graphictools.hxx
include/vcl/group.hxx
@@ -14006,20 +14006,7 @@ svtools/source/filter/DocumentToGraphicRenderer.cxx
svtools/source/filter/SvFilterOptionsDialog.cxx
svtools/source/filter/exportdialog.cxx
svtools/source/filter/exportdialog.hxx
-svtools/source/graphic/descriptor.cxx
-svtools/source/graphic/descriptor.hxx
-svtools/source/graphic/graphic.cxx
-svtools/source/graphic/graphic.hxx
-svtools/source/graphic/graphicunofactory.cxx
-svtools/source/graphic/grfattr.cxx
-svtools/source/graphic/grfcache.cxx
-svtools/source/graphic/grfcache.hxx
-svtools/source/graphic/grfmgr.cxx
-svtools/source/graphic/grfmgr2.cxx
-svtools/source/graphic/provider.cxx
svtools/source/graphic/renderer.cxx
-svtools/source/graphic/transformer.cxx
-svtools/source/graphic/transformer.hxx
svtools/source/hatchwindow/documentcloser.cxx
svtools/source/hatchwindow/hatchwindow.cxx
svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -18221,6 +18208,19 @@ vcl/source/gdi/textlayout.cxx
vcl/source/gdi/vectorgraphicdata.cxx
vcl/source/gdi/virdev.cxx
vcl/source/gdi/wall.cxx
+vcl/source/graphic/GraphicObject.cxx
+vcl/source/graphic/GraphicObject2.cxx
+vcl/source/graphic/grfattr.cxx
+vcl/source/graphic/grfcache.cxx
+vcl/source/graphic/grfcache.hxx
+vcl/source/graphic/UnoGraphic.cxx
+vcl/source/graphic/UnoGraphic.hxx
+vcl/source/graphic/UnoGraphicDescriptor.cxx
+vcl/source/graphic/UnoGraphicDescriptor.hxx
+vcl/source/graphic/UnoGraphicObject.cxx
+vcl/source/graphic/UnoGraphicProvider.cxx
+vcl/source/graphic/UnoGraphicTransformer.cxx
+vcl/source/graphic/UnoGraphicTransformer.hxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/helper/canvastools.cxx
vcl/source/helper/commandinfoprovider.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 263d2646b910..66cdda687dc6 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -150,16 +150,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/filter/SvFilterOptionsDialog \
svtools/source/filter/DocumentToGraphicRenderer \
svtools/source/filter/exportdialog \
- svtools/source/graphic/descriptor \
- svtools/source/graphic/graphic \
- svtools/source/graphic/graphicunofactory \
- svtools/source/graphic/grfattr \
- svtools/source/graphic/grfcache \
- svtools/source/graphic/grfmgr \
- svtools/source/graphic/grfmgr2 \
- svtools/source/graphic/provider \
svtools/source/graphic/renderer \
- svtools/source/graphic/transformer \
svtools/source/hatchwindow/documentcloser \
svtools/source/hatchwindow/hatchwindow \
svtools/source/hatchwindow/hatchwindowfactory \
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 16029ba95cfa..d3ed09986710 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -120,6 +120,7 @@
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/help.hxx>
#include <vcl/i18nhelp.hxx>
@@ -415,7 +416,6 @@
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/brwbox.hxx>
#include <svtools/colorcfg.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/headbar.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmltokn.h>
diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx
index 44a677617091..ee119e46c793 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -11,7 +11,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <test/bootstrapfixture.hxx>
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 0c67524789b1..4280dbe6bf7e 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -34,9 +34,8 @@
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <svl/itemprop.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <comphelper/servicehelper.hxx>
-#include "graphic.hxx"
#define UNOGRAPHIC_DEVICE 1
#define UNOGRAPHIC_DESTINATIONRECT 2
@@ -283,12 +282,10 @@ void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphi
{
if( mpOutDev && mxDevice.is() && rxGraphic.is() )
{
- const uno::Reference< XInterface > xIFace( rxGraphic, uno::UNO_QUERY );
- const ::Graphic* pGraphic = ::unographic::Graphic::getImplementation( xIFace );
-
- if( pGraphic )
+ Graphic aGraphic(rxGraphic);
+ if (aGraphic)
{
- GraphicObject aGraphicObject( *pGraphic );
+ GraphicObject aGraphicObject(aGraphic);
aGraphicObject.Draw( mpOutDev, maDestRect.TopLeft(), maDestRect.GetSize() );
}
}
diff --git a/svtools/util/svt.component b/svtools/util/svt.component
index f48425fcad47..f840548d9d3e 100644
--- a/svtools/util/svt.component
+++ b/svtools/util/svt.component
@@ -19,10 +19,6 @@
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
prefix="svt" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.graphic.GraphicProvider"
- constructor="com_sun_star_comp_graphic_GraphicProvider_get_implementation">
- <service name="com.sun.star.graphic.GraphicProvider"/>
- </implementation>
<implementation name="com.sun.star.comp.graphic.GraphicRendererVCL"
constructor="com_sun_star_comp_graphic_GraphicRendererVCL_get_implementation">
<service name="com.sun.star.graphic.GraphicRendererVCL"/>
@@ -35,10 +31,6 @@
constructor="com_sun_star_comp_svtools_uno_Wizard_get_implementation">
<service name="com.sun.star.ui.dialogs.Wizard"/>
</implementation>
- <implementation name="com.sun.star.graphic.GraphicObject"
- constructor="com_sun_star_graphic_GraphicObject_get_implementation">
- <service name="com.sun.star.graphic.GraphicObject"/>
- </implementation>
<implementation name="com.sun.star.svtools.SvFilterOptionsDialog"
constructor="com_sun_star_svtools_SvFilterOptionsDialog_get_implementation">
<service name="com.sun.star.ui.dialogs.FilterOptionsDialog"/>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 61fa131fec85..e89a697c1fd6 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -100,6 +100,7 @@
#include <vcl/font.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/group.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
@@ -381,7 +382,6 @@
#include <svtools/ctrltool.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/framestatuslistener.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/imap.hxx>
#include <svtools/imapobj.hxx>
#include <svtools/miscopt.hxx>
diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
index f8b09a182884..551089373e29 100644
--- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -22,7 +22,7 @@
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx>
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index a0a96bf08aac..a00216d40b16 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -11,6 +11,7 @@
#include <vcl/svapp.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/graphicfilter.hxx>
#include <svx/xoutbmp.hxx>
@@ -18,7 +19,6 @@
#include <svx/svdpagv.hxx>
#include <svx/svdograf.hxx>
#include <svx/fmview.hxx>
-#include <svtools/grfmgr.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <salhelper/thread.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 0027053721ea..1a00716fa088 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -28,9 +28,9 @@
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/localfilehelper.hxx>
#include <svl/style.hxx>
-#include <vcl/graphicfilter.hxx>
#include <svl/urihelper.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/graphicfilter.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/linkmgr.hxx>
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 88c6856c616a..0f96fba6ceef 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -21,8 +21,8 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <svx/svdpntv.hxx>
#include <vcl/weld.hxx>
+#include <vcl/GraphicObject.hxx>
#include <svx/sdrpaintwindow.hxx>
-#include <svtools/grfmgr.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 49758fd1f4d5..cf0f978a26eb 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
unoxml/source/service/unoxml \
writerfilter/util/writerfilter \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ vcl/vcl.common \
xmloff/source/transform/xof \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 2fe3e02e358a..850c105efd13 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
unotools/util/utl \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
writerfilter/util/writerfilter \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 3b47059546cf..49718251c6b5 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/$(if $(filter WNT,$(OS)),xsec_xmlsec.windows,xsec_xmlsec) \
))
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index 336b235a7df1..925c639e8b25 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
$(if $(filter-out MACOSX WNT,$(OS)), \
$(if $(ENABLE_HEADLESS),, \
vcl/vcl.unx \
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index be599de21a48..2f33310d9cf8 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
) \
) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ vcl/vcl.common \
xmloff/util/xo \
svgio/svgio \
))
diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk b/sw/CppunitTest_sw_ooxmlexport8.mk
index 202e4398abc4..c46530afaef0 100644
--- a/sw/CppunitTest_sw_ooxmlexport8.mk
+++ b/sw/CppunitTest_sw_ooxmlexport8.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport8,\
unoxml/source/service/unoxml \
unoxml/source/rdf/unordf \
uui/util/uui \
+ vcl/vcl.common \
writerfilter/util/writerfilter \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 4638a3d32c61..3f887efa53ed 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
unoxml/source/service/unoxml \
unoxml/source/rdf/unordf \
uui/util/uui \
+ vcl/vcl.common \
writerfilter/util/writerfilter \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index 4867f92096da..4f227b919fa1 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\
unoxml/source/service/unoxml \
uui/util/uui \
writerfilter/util/writerfilter \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 45680deb9231..fda20b5c2e28 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\
unoxml/source/rdf/unordf \
uui/util/uui \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk
index 99551b36750e..5ece5d90a0a3 100644
--- a/sw/CppunitTest_sw_ww8export2.mk
+++ b/sw/CppunitTest_sw_ww8export2.mk
@@ -77,6 +77,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export2,\
unoxml/source/rdf/unordf \
uui/util/uui \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 7881d6ea656c..7e40c058e722 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
))
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 7936bd51bb0d..024c91849a62 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -23,7 +23,7 @@
#include <tools/gen.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <svx/grfcrop.hxx>
#include "swdllapi.h"
#include "swatrset.hxx"
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 5d465d76d2d1..104b3eb68dd6 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -19,11 +19,13 @@
#ifndef INCLUDED_SW_INC_NDGRF_HXX
#define INCLUDED_SW_INC_NDGRF_HXX
+
#include <sfx2/lnkbase.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include "ndnotxt.hxx"
#include <com/sun/star/embed/XStorage.hpp>
#include <memory>
+
class SwAsyncRetrieveInputStreamThreadConsumer;
class SwGrfFormatColl;
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index faa6ba21b06d..3eaf043af617 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -138,6 +138,7 @@
#include <vcl/gfxlink.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/hatch.hxx>
#include <vcl/idle.hxx>
@@ -551,7 +552,6 @@
#include <svtools/colorcfg.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/embedhlp.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/ruler.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 61baf2411795..12419305f50f 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -115,6 +115,7 @@
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/help.hxx>
#include <vcl/image.hxx>
@@ -463,7 +464,6 @@
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <svtools/ctrltool.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/htmlcfg.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmlout.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index deee95c725bf..6322d2fa84a9 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -150,6 +150,7 @@
#include <vcl/gfxlink.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/group.hxx>
#include <vcl/hatch.hxx>
#include <vcl/help.hxx>
@@ -594,7 +595,6 @@
#include <svtools/ehdl.hxx>
#include <svtools/embedhlp.hxx>
#include <svtools/framestatuslistener.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/headbar.hxx>
#include <svtools/htmlcfg.hxx>
#include <svtools/miscopt.hxx>
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index 927873992c28..443556f02d30 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -76,6 +76,7 @@ define sw_ooxmlexport_components
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
writerfilter/util/writerfilter \
xmloff/util/xo
endef
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 2ff88c18797f..a9b318aebbe6 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -19,7 +19,7 @@
#include <com/sun/star/drawing/ColorMode.hpp>
#include <o3tl/any.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <swtypes.hxx>
#include <grfatr.hxx>
#include <swunohelper.hxx>
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 237372b10d81..91d8e155869e 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -70,7 +70,7 @@
#include <unotextbodyhf.hxx>
#include <SwStyleNameMapper.hxx>
#include <editeng/brushitem.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <unomid.h>
#include <strings.hrc>
#include <svx/svdundo.hxx>
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 85d6bd963143..c9ed33c53dc7 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -25,7 +25,7 @@
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/XMLBase64ImportContext.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <svx/unomid.hxx>
#include <editeng/brushitem.hxx>
#include <xmloff/xmluconv.hxx>
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 5f9cbf1369a1..2a0978c24c7f 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -21,9 +21,9 @@
#include <svl/itemiter.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/GraphicObject.hxx>
#include <editeng/itemtype.hxx>
-#include <svtools/grfmgr.hxx>
#include <unotools/intlwrapper.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0aecb5e16a1c..a777f238a070 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -19,6 +19,8 @@
$(eval $(call gb_Library_Library,vcl))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.common))
+
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
else ifeq ($(OS),WNT)
@@ -301,6 +303,15 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/gdi/scrptrun \
vcl/source/gdi/CommonSalLayout \
vcl/source/graphic/GraphicLoader \
+ vcl/source/graphic/GraphicObject \
+ vcl/source/graphic/GraphicObject2 \
+ vcl/source/graphic/grfcache \
+ vcl/source/graphic/grfattr \
+ vcl/source/graphic/UnoGraphic \
+ vcl/source/graphic/UnoGraphicDescriptor \
+ vcl/source/graphic/UnoGraphicObject \
+ vcl/source/graphic/UnoGraphicProvider \
+ vcl/source/graphic/UnoGraphicTransformer \
vcl/source/bitmap/bitmap \
vcl/source/bitmap/bitmapfilter \
vcl/source/bitmap/bitmappaint \
diff --git a/svtools/source/graphic/grfmgr.cxx b/vcl/source/graphic/GraphicObject.cxx
similarity index 99%
rename from svtools/source/graphic/grfmgr.cxx
rename to vcl/source/graphic/GraphicObject.cxx
index d025275e39f8..a4dbddea1cae 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -33,7 +33,7 @@
#include <vcl/cvtgrf.hxx>
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svtools/source/graphic/grfmgr2.cxx b/vcl/source/graphic/GraphicObject2.cxx
similarity index 99%
rename from svtools/source/graphic/grfmgr2.cxx
rename to vcl/source/graphic/GraphicObject2.cxx
index d19f8c1eae04..c6a7e688d9af 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/vcl/source/graphic/GraphicObject2.cxx
@@ -32,7 +32,7 @@
#include <vcl/alpha.hxx>
#include <vcl/virdev.hxx>
#include "grfcache.hxx"
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <memory>
diff --git a/svtools/source/graphic/graphic.cxx b/vcl/source/graphic/UnoGraphic.cxx
similarity index 99%
rename from svtools/source/graphic/graphic.cxx
rename to vcl/source/graphic/UnoGraphic.cxx
index c2969d3cdf67..5821a254da92 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/vcl/source/graphic/UnoGraphic.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/graphic/GraphicType.hpp>
#include <com/sun/star/graphic/XGraphicTransformer.hpp>
#include <vcl/dibtools.hxx>
-#include "graphic.hxx"
+#include "UnoGraphic.hxx"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list