summaryrefslogtreecommitdiff
path: root/sd
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 /sd
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 'sd')
-rw-r--r--sd/inc/pch/precompiled_sd.hxx2
-rw-r--r--sd/inc/pch/precompiled_sdui.hxx2
-rw-r--r--sd/source/filter/eppt/eppt.cxx2
-rw-r--r--sd/source/filter/eppt/eppt.hxx2
-rw-r--r--sd/source/filter/eppt/pptx-epptbase.cxx2
-rw-r--r--sd/source/filter/html/buttonset.cxx2
-rw-r--r--sd/source/filter/html/pubdlg.cxx2
-rw-r--r--sd/source/ui/dlg/prltempl.cxx2
-rw-r--r--sd/source/ui/func/bulmaper.cxx2
-rw-r--r--sd/source/ui/inc/sdxfer.hxx2
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx2
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--sd/source/ui/view/drviews9.cxx2
-rw-r--r--sd/source/ui/view/sdview2.cxx2
14 files changed, 14 insertions, 14 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index a24a582925bf..f8d6e1676b68 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -99,7 +99,7 @@
#include <vcl/fixed.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/help.hxx>
#include <vcl/idle.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index f8fbba2442d0..4b0505237801 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -139,7 +139,7 @@
#include <vcl/gfxlink.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/hatch.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 9e5c4a791021..c0a2c8653f5e 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -21,7 +21,7 @@
#include "epptdef.hxx"
#include <tools/globname.hxx>
#include <tools/poly.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/gradient.hxx>
#include <rtl/ustring.hxx>
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index b24d797dcfab..02ffe21b92e0 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -23,7 +23,7 @@
#include "escherex.hxx"
#include <sal/types.h>
#include <sot/storage.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <unotools/fontcvt.hxx>
#include "pptexanimations.hxx"
#include <pptexsoundcollection.hxx>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 450b835a6bae..504957ff1630 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -24,7 +24,7 @@
#include <tools/datetime.hxx>
#include <tools/poly.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/gradient.hxx>
#include <vcl/virdev.hxx>
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 2d07d782e135..07863e3b7570 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -29,7 +29,7 @@
#include <comphelper/storagehelper.hxx>
#include <comphelper/oslfile2streamwrap.hxx>
#include <comphelper/processfactory.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/virdev.hxx>
#include <vcl/image.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 214d5bf816af..784bac0f1a59 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -31,7 +31,7 @@
#include <svl/stritem.hxx>
#include <vcl/msgbox.hxx>
#include <svtools/valueset.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/eitem.hxx>
#include <svtools/colrdlg.hxx>
#include <editeng/colritem.hxx>
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 3b0b102612f4..c341a2c0868e 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -28,7 +28,7 @@
#include <editeng/bulletitem.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/brushitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/numitem.hxx>
#include <svl/cjkoptions.hxx>
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 2f27d91b2495..877e5238d9df 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -33,7 +33,7 @@
//<- Fonts & Items
#include <editeng/bulletitem.hxx>
#include <editeng/brushitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/itemset.hxx>
#include <svl/itempool.hxx>
#include <editeng/numitem.hxx>
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 76a636999fd0..18171350e5ac 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_INC_SDXFER_HXX
#include <svtools/transfer.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <sfx2/objsh.hxx>
#include <svl/lstner.hxx>
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index af9a9ea1a655..f976490086dd 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -23,7 +23,7 @@
#include <rtl/ref.hxx>
#include <sal/types.h>
#include <vcl/timer.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include "Window.hxx"
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index cebb95bc1d91..720ff6d5ee78 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -83,7 +83,7 @@
#include <unotools/useroptions.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/waitobj.hxx>
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 46abdffd0bfc..f8f3fd0acd2f 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -39,7 +39,7 @@
#include <svx/svxids.hrc>
#include <svx/xtable.hxx>
#include <svx/gallery.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdoole2.hxx>
#include <sot/storage.hxx>
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 9cd5e901ce64..c483bada3826 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -26,7 +26,7 @@
#include <svx/svdetc.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdograf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svx/xexch.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>