vcl: move graph.[hx]xx to graphic.[hc]xx

It's IMO a bit confusing to see a "graph" header that doesn't
strictly deal with graphs, but graphics.

Backporting to 5.1 series to allow for easier backporting of
other potential hotfixes.

Change-Id: Ic37c6cd78e23d05939486f98667144c4453bb0a3
Reviewed-on: https://gerrit.libreoffice.org/22949
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

23 files changed, 22 insertions, 22 deletions

diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
index 4d4cce6fcc27..18e7da12c9a1 100644
--- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
@@ -25,7 +25,7 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/color/bcolor.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 
 
 
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 26261d2e09c3..4d3ef5b293fe 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -29,7 +29,7 @@
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <vcl/outdev.hxx>
 #include <tools/link.hxx>
 #include <rsc/rscsfx.hxx>
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 28ae9184c443..20470a514ec1 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -37,7 +37,7 @@
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 
 #include <svx/msdffdef.hxx>
 #include <filter/msfilter/dffpropset.hxx>
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 741507af7d89..55c3790622fd 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -29,7 +29,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/docfilt.hxx>
 
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx
index 09de00ea7b06..e5710556b413 100644
--- a/include/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/awt/XToolkit.hpp>
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 
 #include <svtools/svtdllapi.h>
 
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index 29ac2dcd011c..5a5161f71d98 100644
--- a/include/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
@@ -23,7 +23,7 @@
 #include <svtools/svtdllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <tools/mapunit.hxx>
 #include <rtl/ustring.hxx>
 #include <memory>
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index bd8a16469cdd..b8441169657a 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_GRFMGR_HXX
 #define INCLUDED_SVTOOLS_GRFMGR_HXX
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <svtools/svtdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 0149813db49a..8078817a4563 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -24,7 +24,7 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <svx/svxdllapi.h>
 
 #include <svx/dlgctrl.hxx>
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index e7b4897bbe9e..191c356c6d3b 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -22,7 +22,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/slider.hxx>
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 9757cd0e7d38..f636dd4d84c5 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/rectenum.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <svx/xtable.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 63e8a8932e91..d92ade706d78 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_GALCTRL_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
 #include <vcl/button.hxx>
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index cf44b1cf63ac..1fb0411f6d30 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SVX_GRAPHCTL_HXX
 
 #include <vcl/ctrl.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <svx/svxdllapi.h>
 
 #include <svx/svdview.hxx>
diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx
index eca65563ef69..df5100e6bf5b 100644
--- a/include/svx/graphichelper.hxx
+++ b/include/svx/graphichelper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_GRAPHICHELPER_HXX
 #define INCLUDED_SVX_GRAPHICHELPER_HXX
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <svx/svxdllapi.h>
 
 #include <com/sun/star/drawing/XShape.hpp>
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index d596d22a256e..c03b0e767c4a 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_SVDOGRAF_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <svx/svdorect.hxx>
 #include <svtools/grfmgr.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx
index 00e2f0d1c089..3d47e752b0f7 100644
--- a/include/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgrahicitem.hxx
@@ -23,7 +23,7 @@
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 
 class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem
 {
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index 37dfb307701c..af9877520337 100644
--- a/include/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_XOUTBMP_HXX
 #define INCLUDED_SVX_XOUTBMP_HXX
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <svx/svxdllapi.h>
diff --git a/include/vcl/GraphicNativeMetadata.hxx b/include/vcl/GraphicNativeMetadata.hxx
index bc9f871cc06d..fab77b55d6ca 100644
--- a/include/vcl/GraphicNativeMetadata.hxx
+++ b/include/vcl/GraphicNativeMetadata.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_GRAPHICNATIVEMETADATA_HXX
 #define INCLUDED_VCL_GRAPHICNATIVEMETADATA_HXX
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 
 class VCL_DLLPUBLIC GraphicNativeMetadata
 {
diff --git a/include/vcl/GraphicNativeTransform.hxx b/include/vcl/GraphicNativeTransform.hxx
index b6b66fc75f98..e803004b4c4d 100644
--- a/include/vcl/GraphicNativeTransform.hxx
+++ b/include/vcl/GraphicNativeTransform.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_GRAPHICNATIVETRANSFORM_HXX
 #define INCLUDED_VCL_GRAPHICNATIVETRANSFORM_HXX
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 
 class VCL_DLLPUBLIC GraphicNativeTransform
 {
diff --git a/include/vcl/graph.hxx b/include/vcl/graphic.hxx
index 34c65909207e..34c65909207e 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graphic.hxx
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index a1d987f7fbe5..9b3e3e746472 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -24,7 +24,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/field.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 #include <com/sun/star/uno/Sequence.h>
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index b3da2733469a..0f49edebed71 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -25,7 +25,7 @@
 #include <rtl/string.hxx>
 #include <tools/color.hxx>
 #include <tools/poly.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 476711af78ef..0834e48528b6 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -29,7 +29,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/region.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
diff --git a/include/vcl/salctype.hxx b/include/vcl/salctype.hxx
index 4fdc6a8ba75a..cefd4551dbba 100644
--- a/include/vcl/salctype.hxx
+++ b/include/vcl/salctype.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/config.h>
 
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
 
 enum class ConvertDataFormat
 {