Move (and rename) graphic stuff from svtools to vcl

Desktop / LibreOffice - Tomaž Vajngerl [collabora.co.uk] - 11 March 2018 12:37 EDT

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

7fbb96c2fbf9 Move (and rename) graphic stuff from svtools to vcl
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 +-
.../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 +-
.../source/core/dataaccess/databasedocument.cxx | 2 +-
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 +-
desktop/CppunitTest_desktop_lib.mk | 1 +
.../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 +-
.../primitive2d/graphicprimitive2d.hxx | 2 +-
.../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 +-
.../{svtools/grfmgr.hxx => 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 ++++
.../source/graphic/GraphicObject.cxx | 2 +-
.../source/graphic/GraphicObject2.cxx | 2 +-
.../source/graphic/UnoGraphic.cxx | 2 +-
.../source/graphic/UnoGraphic.hxx | 8 +--
.../source/graphic/UnoGraphicDescriptor.cxx | 2 +-
.../source/graphic/UnoGraphicDescriptor.hxx | 4 +-
.../source/graphic/UnoGraphicObject.cxx | 2 +-
.../source/graphic/UnoGraphicProvider.cxx | 6 +--
.../source/graphic/UnoGraphicTransformer.cxx | 16 ++----
.../source/graphic/UnoGraphicTransformer.hxx | 4 +-
{svtools => vcl}/source/graphic/grfattr.cxx | 2 +-
{svtools => vcl}/source/graphic/grfcache.cxx | 2 +-
{svtools => 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(-)

Upstream: cgit.freedesktop.org


  • Share