summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-03-06 18:22:36 +1100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-03-15 21:25:56 +0000
commit90b670f5bfd95e879426b73a14c8347ae3bc80b2 (patch)
tree56bfd101856edb75ccaa975da23ace09fe304303 /svx
parent3b384f0c6e3effeeb7226798b57020b3a68b20c4 (diff)
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>
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/GalleryControl.hxx2
-rw-r--r--svx/inc/galobj.hxx2
-rw-r--r--svx/inc/pch/precompiled_svx.hxx2
-rw-r--r--svx/inc/pch/precompiled_svxcore.hxx2
-rw-r--r--svx/source/core/extedit.cxx2
-rw-r--r--svx/source/dialog/compressgraphicdialog.cxx2
-rw-r--r--svx/source/dialog/hdft.cxx2
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx2
-rw-r--r--svx/source/sdr/attribute/sdrallfillattributeshelper.cxx2
-rw-r--r--svx/source/sidebar/nbdtmg.cxx2
-rw-r--r--svx/source/sidebar/tools/ValueSetWithTextControl.cxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.hxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx2
13 files changed, 13 insertions, 13 deletions
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index db467e547a2d..6bee33cc418a 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SVX_INC_GALLERYCONTROL_HXX
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <tools/urlobj.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 8398a7d366c3..720446d699a6 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_INC_GALOBJ_HXX
#include <tools/urlobj.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include "svx/galmisc.hxx"
#define S_THUMB 80
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 4c74ffb171fa..a040847bad22 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -100,7 +100,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/gradient.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/group.hxx>
#include <vcl/hatch.hxx>
#include <vcl/idle.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index ac6c37707398..ac46acd2da52 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -128,7 +128,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 3f9c22b45cef..cd402c592ad6 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -10,7 +10,7 @@
#include <svx/extedit.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/graphicfilter.hxx>
#include <svx/xoutbmp.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 3f65607b0157..9e6567a89edc 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -18,7 +18,7 @@
*/
#include <dlgunit.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index aca7ecdf70c8..7af5341e2ebb 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -22,7 +22,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/module.hxx>
#include <vcl/msgbox.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <sfx2/sfxsids.hrc>
#include <svx/svxids.hrc>
#include <svx/dialogs.hrc>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 953f062a2095..7b3984adfe85 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -31,7 +31,7 @@
#include <editeng/brushitem.hxx>
#include <svl/intitem.hxx>
#include <sfx2/objsh.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
index 58965e446b19..045d398d918d 100644
--- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
+++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
@@ -25,7 +25,7 @@
#include <drawinglayer/attribute/fillhatchattribute.hxx>
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <svx/xfillit0.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 78d4a7c65609..9d0eacf225d7 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -32,7 +32,7 @@
#include <editeng/brushitem.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/settings.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index d2c9943113e5..3238cb6697ae 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -25,7 +25,7 @@
#include <i18nlangtag/mslangid.hxx>
#include <svtools/valueset.hxx>
#include <editeng/brushitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/settings.hxx>
namespace svx { namespace sidebar {
diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx
index dafb10e3c6c7..e05c0d3a4bed 100644
--- a/svx/source/unodraw/UnoGraphicExporter.hxx
+++ b/svx/source/unodraw/UnoGraphicExporter.hxx
@@ -22,7 +22,7 @@
#include <sal/config.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
class SdrObject;
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 8abfe5c3339c..9ef9262bc6db 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -25,7 +25,7 @@
#include <svx/fmmodel.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/itemprop.hxx>
#include <svl/itempool.hxx>
#include <comphelper/servicehelper.hxx>