summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-03-11 11:16:34 +0900
committerTomaž Vajngerl <quikee@gmail.com>2018-03-11 13:37:21 +0100
commit7fbb96c2fbf99c47eca6f493f54fc3974f55cf86 (patch)
treec700a011983d1868ed08415de277ec82d2852074 /chart2
parente6d2332eae92b8f288d3d3f8aa2090abfa777098 (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 'chart2')
-rwxr-xr-xchart2/CppunitTest_chart2_dump.mk1
-rw-r--r--chart2/CppunitTest_chart2_export.mk1
-rw-r--r--chart2/CppunitTest_chart2_import.mk1
-rw-r--r--chart2/CppunitTest_chart2_pivot_chart_test.mk1
-rw-r--r--chart2/CppunitTest_chart2_trendcalculators.mk1
-rw-r--r--chart2/CppunitTest_chart2_xshape.mk1
-rw-r--r--chart2/inc/ChartModel.hxx2
-rw-r--r--chart2/inc/pch/precompiled_chartcontroller.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx2
9 files changed, 9 insertions, 3 deletions
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>