diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-11 11:16:34 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-11 13:37:21 +0100 |
| commit | 7fbb96c2fbf99c47eca6f493f54fc3974f55cf86 (patch) | |
| tree | c700a011983d1868ed08415de277ec82d2852074 /sd | |
| parent | e6d2332eae92b8f288d3d3f8aa2090abfa777098 (diff) | |
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@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sd')
| -rwxr-xr-x | sd/CppunitTest_sd_activex_controls_tests.mk | 3 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 1 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_html_export_tests.mk | 1 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_import_tests.mk | 1 | ||||
| -rwxr-xr-x | sd/CppunitTest_sd_import_tests_smartart.mk | 1 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_misc_tests.mk | 1 | ||||
| -rw-r--r-- | sd/inc/pch/precompiled_sdui.hxx | 2 |
7 files changed, 8 insertions, 2 deletions
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> |