[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - accessibility/inc avmedia/source basctl/inc basic/inc chart2/inc chart2/source cppcanvas/inc cppcanvas/source cui/inc cui/source dbaccess/inc dbaccess/source desktop/inc drawinglayer/inc drawinglayer/source editeng/inc editeng/source filter/qa filter/source forms/inc framework/inc framework/source include/drawinglayer include/editeng include/filter include/sfx2 include/svtools include/svx include/vcl oox/inc oox/source reportdesign/inc sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source slideshow/inc slideshow/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source toolkit/source vbahelper/inc vcl/inc vcl/Library_vcl.mk vcl/source vcl/workben xmlsecurity/inc
Chris Sherlock
chris.sherlock79 at gmail.com
Tue Mar 15 21:26:25 UTC 2016
accessibility/inc/pch/precompiled_acc.hxx | 2
avmedia/source/gstreamer/gstframegrabber.cxx | 2
avmedia/source/macavf/framegrabber.mm | 2
avmedia/source/opengl/oglframegrabber.cxx | 2
avmedia/source/opengl/oglplayer.cxx | 2
avmedia/source/quicktime/framegrabber.mm | 2
avmedia/source/vlc/vlcframegrabber.cxx | 2
avmedia/source/win/framegrabber.cxx | 2
basctl/inc/pch/precompiled_basctl.hxx | 2
basic/inc/sbstdobj.hxx | 2
chart2/inc/pch/precompiled_chartcontroller.hxx | 2
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 2
chart2/source/controller/main/ChartTransferable.cxx | 2
chart2/source/view/main/OpenGLRender.cxx | 2
cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 2
cppcanvas/source/wrapper/vclfactory.cxx | 2
cui/inc/pch/precompiled_cui.hxx | 2
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/about.cxx | 2
cui/source/inc/backgrnd.hxx | 2
cui/source/inc/cuigaldlg.hxx | 2
cui/source/inc/grfpage.hxx | 2
cui/source/tabpages/numpages.cxx | 2
cui/source/tabpages/page.cxx | 2
dbaccess/inc/pch/precompiled_dba.hxx | 2
dbaccess/inc/pch/precompiled_dbmm.hxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2
dbaccess/source/ui/control/opendoccontrols.cxx | 2
desktop/inc/pch/precompiled_sofficeapp.hxx | 2
drawinglayer/inc/pch/precompiled_drawinglayer.hxx | 2
drawinglayer/source/attribute/fillgraphicattribute.cxx | 2
drawinglayer/source/attribute/sdrfillgraphicattribute.cxx | 2
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 2
drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx | 2
drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2
drawinglayer/source/processor2d/vclprocessor2d.cxx | 2
drawinglayer/source/processor3d/defaultprocessor3d.cxx | 2
editeng/inc/pch/precompiled_editeng.hxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/editobj.cxx | 2
editeng/source/items/numitem.cxx | 2
editeng/source/outliner/outliner.cxx | 2
editeng/source/uno/unonrule.cxx | 2
filter/qa/cppunit/filters-dxf-test.cxx | 2
filter/qa/cppunit/filters-eps-test.cxx | 2
filter/qa/cppunit/filters-met-test.cxx | 2
filter/qa/cppunit/filters-pcd-test.cxx | 2
filter/qa/cppunit/filters-pcx-test.cxx | 2
filter/qa/cppunit/filters-pict-test.cxx | 2
filter/qa/cppunit/filters-ppm-test.cxx | 2
filter/qa/cppunit/filters-psd-test.cxx | 2
filter/qa/cppunit/filters-ras-test.cxx | 2
filter/qa/cppunit/filters-tga-test.cxx | 2
filter/qa/cppunit/filters-tiff-test.cxx | 2
filter/source/graphicfilter/egif/egif.cxx | 2
filter/source/graphicfilter/eos2met/eos2met.cxx | 2
filter/source/graphicfilter/epbm/epbm.cxx | 2
filter/source/graphicfilter/epgm/epgm.cxx | 2
filter/source/graphicfilter/epict/epict.cxx | 2
filter/source/graphicfilter/eppm/eppm.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 2
filter/source/graphicfilter/eras/eras.cxx | 2
filter/source/graphicfilter/etiff/etiff.cxx | 2
filter/source/graphicfilter/expm/expm.cxx | 2
filter/source/graphicfilter/icgm/cgm.cxx | 2
filter/source/graphicfilter/idxf/idxf.cxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 2
filter/source/graphicfilter/ios2met/ios2met.cxx | 2
filter/source/graphicfilter/ipbm/ipbm.cxx | 2
filter/source/graphicfilter/ipcd/ipcd.cxx | 2
filter/source/graphicfilter/ipcx/ipcx.cxx | 2
filter/source/graphicfilter/ipict/ipict.cxx | 2
filter/source/graphicfilter/ipsd/ipsd.cxx | 2
filter/source/graphicfilter/iras/iras.cxx | 2
filter/source/graphicfilter/itga/itga.cxx | 2
filter/source/graphicfilter/itiff/itiff.cxx | 2
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/eschesdo.cxx | 2
filter/source/msfilter/mstoolbar.cxx | 2
filter/source/svg/svgreader.cxx | 2
forms/inc/pch/precompiled_frm.hxx | 2
framework/inc/pch/precompiled_fwe.hxx | 2
framework/inc/pch/precompiled_fwk.hxx | 2
framework/inc/pch/precompiled_fwl.hxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/uielement/buttontoolbarcontroller.cxx | 2
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 2
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 2
include/drawinglayer/primitive2d/mediaprimitive2d.hxx | 2
include/editeng/outliner.hxx | 2
include/filter/msfilter/msdffimp.hxx | 2
include/sfx2/filedlghelper.hxx | 2
include/svtools/DocumentToGraphicRenderer.hxx | 2
include/svtools/embedhlp.hxx | 2
include/svtools/grfmgr.hxx | 2
include/svx/bmpmask.hxx | 2
include/svx/compressgraphicdialog.hxx | 2
include/svx/dlgctrl.hxx | 2
include/svx/galctrl.hxx | 2
include/svx/graphctl.hxx | 2
include/svx/graphichelper.hxx | 2
include/svx/svdograf.hxx | 2
include/svx/svxgrahicitem.hxx | 2
include/svx/xoutbmp.hxx | 2
include/vcl/GraphicNativeMetadata.hxx | 2
include/vcl/GraphicNativeTransform.hxx | 2
include/vcl/graph.hxx | 201 ---
include/vcl/graphic.hxx | 201 +++
include/vcl/graphicfilter.hxx | 2
include/vcl/graphictools.hxx | 2
include/vcl/metaact.hxx | 2
include/vcl/salctype.hxx | 2
oox/inc/pch/precompiled_oox.hxx | 2
oox/source/drawingml/shape.cxx | 2
oox/source/export/drawingml.cxx | 2
oox/source/export/shapes.cxx | 2
reportdesign/inc/pch/precompiled_rpt.hxx | 2
reportdesign/inc/pch/precompiled_rptui.hxx | 2
sc/inc/drwlayer.hxx | 2
sc/inc/pch/precompiled_sc.hxx | 2
sc/inc/pch/precompiled_scfilt.hxx | 2
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xipage.cxx | 2
sc/source/filter/excel/xltoolbar.cxx | 2
sc/source/filter/inc/eeparser.hxx | 2
sc/source/filter/inc/xeescher.hxx | 2
sc/source/filter/inc/xiescher.hxx | 2
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/viewfun3.cxx | 2
sc/source/ui/view/viewfun5.cxx | 2
sd/inc/pch/precompiled_sd.hxx | 2
sd/inc/pch/precompiled_sdui.hxx | 2
sd/source/filter/eppt/eppt.cxx | 2
sd/source/filter/eppt/eppt.hxx | 2
sd/source/filter/eppt/pptx-epptbase.cxx | 2
sd/source/filter/html/buttonset.cxx | 2
sd/source/filter/html/pubdlg.cxx | 2
sd/source/ui/dlg/prltempl.cxx | 2
sd/source/ui/func/bulmaper.cxx | 2
sd/source/ui/inc/sdxfer.hxx | 2
sd/source/ui/slideshow/showwindow.hxx | 2
sd/source/ui/view/drviews2.cxx | 2
sd/source/ui/view/drviews9.cxx | 2
sd/source/ui/view/sdview2.cxx | 2
sfx2/inc/pch/precompiled_sfx.hxx | 2
sfx2/source/appl/linkmgr2.cxx | 2
sfx2/source/control/templatecontaineritem.cxx | 2
sfx2/source/control/templateviewitem.cxx | 2
sfx2/source/control/thumbnailviewitem.cxx | 2
sfx2/source/dialog/filedlgimpl.hxx | 2
sfx2/source/doc/graphhelp.cxx | 2
sfx2/source/menu/mnumgr.cxx | 2
sfx2/source/menu/thessubmenu.cxx | 2
slideshow/inc/pch/precompiled_slideshow.hxx | 2
slideshow/source/engine/shapes/gdimtftools.cxx | 2
slideshow/source/engine/shapes/viewmediashape.cxx | 2
svtools/inc/pch/precompiled_svt.hxx | 2
svtools/source/filter/exportdialog.cxx | 2
svtools/source/graphic/descriptor.cxx | 2
svtools/source/graphic/descriptor.hxx | 2
svtools/source/graphic/graphic.cxx | 2
svtools/source/graphic/grfcache.hxx | 2
svtools/source/misc/transfer.cxx | 2
svtools/source/misc/transfer2.cxx | 2
svtools/source/uno/treecontrolpeer.cxx | 2
svx/inc/GalleryControl.hxx | 2
svx/inc/galobj.hxx | 2
svx/inc/pch/precompiled_svx.hxx | 2
svx/inc/pch/precompiled_svxcore.hxx | 2
svx/source/core/extedit.cxx | 2
svx/source/dialog/compressgraphicdialog.cxx | 2
svx/source/dialog/hdft.cxx | 2
svx/source/dialog/svxbmpnumvalueset.cxx | 2
svx/source/sdr/attribute/sdrallfillattributeshelper.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 2
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 2
svx/source/unodraw/UnoGraphicExporter.hxx | 2
svx/source/unogallery/unogalitem.cxx | 2
sw/inc/pch/precompiled_msword.hxx | 2
sw/inc/pch/precompiled_sw.hxx | 2
sw/inc/pch/precompiled_swui.hxx | 2
sw/inc/pch/precompiled_vbaswobj.hxx | 2
sw/source/core/bastyp/swtypes.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/ole/ndole.cxx | 2
sw/source/core/text/porfld.cxx | 2
sw/source/filter/basflt/fltshell.cxx | 2
sw/source/filter/ww8/wrtww8.hxx | 2
sw/source/filter/ww8/ww8toolbar.cxx | 2
sw/source/ui/frmdlg/wrap.cxx | 2
sw/source/uibase/app/swmodule.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 2
sw/source/uibase/docvw/romenu.hxx | 2
sw/source/uibase/frmdlg/colex.cxx | 2
sw/source/uibase/inc/bmpwin.hxx | 2
sw/source/uibase/inc/swdtflvr.hxx | 2
sw/source/uibase/shells/basesh.cxx | 2
sw/source/uibase/uiview/view.cxx | 2
sw/source/uibase/uiview/view0.cxx | 2
sw/source/uibase/wrtsh/wrtsh1.cxx | 2
toolkit/source/controls/controlmodelcontainerbase.cxx | 2
toolkit/source/controls/dialogcontrol.cxx | 2
toolkit/source/controls/tabpagemodel.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 2
vbahelper/inc/pch/precompiled_msforms.hxx | 2
vcl/Library_vcl.mk | 2
vcl/inc/pch/precompiled_vcl.hxx | 2
vcl/source/filter/igif/gifread.hxx | 2
vcl/source/filter/ixbm/xbmread.hxx | 2
vcl/source/filter/ixpm/xpmread.cxx | 2
vcl/source/filter/jpeg/Exif.hxx | 2
vcl/source/filter/jpeg/JpegReader.hxx | 2
vcl/source/filter/jpeg/JpegTransform.hxx | 2
vcl/source/filter/jpeg/JpegWriter.hxx | 2
vcl/source/filter/jpeg/jpeg.hxx | 2
vcl/source/filter/sgvmain.cxx | 2
vcl/source/filter/wmf/emfwr.hxx | 2
vcl/source/filter/wmf/winmtf.hxx | 2
vcl/source/filter/wmf/wmfwr.hxx | 2
vcl/source/gdi/cvtsvm.cxx | 2
vcl/source/gdi/gfxlink.cxx | 2
vcl/source/gdi/graph.cxx | 596 ----------
vcl/source/gdi/graphic.cxx | 596 ++++++++++
vcl/source/gdi/impgraph.cxx | 2
vcl/source/gdi/pdfextoutdevdata.cxx | 2
vcl/source/gdi/pdfwriter_impl2.cxx | 2
vcl/source/image/Image.cxx | 2
vcl/source/image/ImageList.cxx | 2
vcl/source/opengl/OpenGLContext.cxx | 2
vcl/source/opengl/OpenGLHelper.cxx | 2
vcl/workben/icontest.cxx | 2
vcl/workben/svpclient.cxx | 2
xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 2
238 files changed, 1031 insertions(+), 1031 deletions(-)
New commits:
commit 90b670f5bfd95e879426b73a14c8347ae3bc80b2
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun Mar 6 18:22:36 2016 +1100
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 at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 71b57e5..2b66781 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -125,7 +125,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/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index cd2eadf..11dae9f 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -26,7 +26,7 @@
#include <gst/video/video.h>
#include <gst/video/gstvideosink.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <string>
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index bf54b01..9d6dd04 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -21,7 +21,7 @@
#include "player.hxx"
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/cvtgrf.hxx>
#include <unotools/localfilehelper.hxx>
diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx
index 083cb60..a720c8e 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -11,7 +11,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/bmpacc.hxx>
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 4aade3c..33170a8 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -13,7 +13,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <tools/urlobj.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index e3cc480..3065637 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -21,7 +21,7 @@
#include "player.hxx"
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/cvtgrf.hxx>
#include <unotools/localfilehelper.hxx>
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 850b72f..5ee29fb 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -21,7 +21,7 @@
#include <iostream>
#include <osl/conditn.hxx>
#include <osl/file.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/pngread.hxx>
#include <avmedia/mediawindow.hxx>
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 4d6305c..f1f8119 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -38,7 +38,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/dibtools.hxx>
#define AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_DirectX"
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index b6da33e..c1f101b 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -143,7 +143,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/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 100657c..59d8731 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_BASIC_INC_SBSTDOBJ_HXX
#include <basic/sbxobj.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <basic/sbxfac.hxx>
#include <basic/basicdllapi.h>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 7c2bea8..89bc5d1 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -131,7 +131,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/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 350a593..bfb39a6 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -46,7 +46,7 @@
#include <vcl/unohelp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/settings.hxx>
#include <o3tl/functional.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index cedab39..2f787d9 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <editeng/unoprnms.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svtools/grfmgr.hxx>
#include <vcl/outdev.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index d92caaa..1eb84b6 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -42,7 +42,7 @@
#include <svl/stritem.hxx>
#include <editeng/brushitem.hxx>
#include <svl/ilstitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <svx/tabline.hxx>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 6cfece9..0a8a07b 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -55,7 +55,7 @@
#include <svx/ActionDescriptionProvider.hxx>
#include <svtools/transfer.hxx>
#include <sot/storage.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svx/unomodel.hxx>
#include <svx/svdmodel.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index 963285a..cfdd90f 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -22,7 +22,7 @@
#include <sot/exchange.hxx>
#include <sot/storage.hxx>
#include <unotools/streamwrap.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/itempool.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/fhgtitem.hxx>
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 68e7e4f..8853e80 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -10,7 +10,7 @@
#include <GL/glew.h>
#include <vector>
#include "OpenGLRender.hxx"
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
index 271bb62..4ecf8ea 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
@@ -109,7 +109,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/impdel.hxx>
#include <vcl/inputctx.hxx>
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 4715e79..aef43c1 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -22,7 +22,7 @@
#include <osl/diagnose.h>
#include <com/sun/star/rendering/InterpolationMode.hpp>
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/canvastools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index c1d76b2..59d160d 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -140,7 +140,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/help.hxx>
#include <vcl/idle.hxx>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a2f79c6..4a79b28 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -43,7 +43,7 @@
#include <com/sun/star/system/SystemShellExecute.hpp>
#include <sfx2/app.hxx>
#include <vcl/help.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/builderfactory.hxx>
#include <osl/file.hxx>
#include <cuires.hrc>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ab23cf8..38dad7f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -26,7 +26,7 @@
#include <unotools/configmgr.hxx>
#include <unotools/bootstrap.hxx>
#include <com/sun/star/uno/Any.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <svtools/langhelp.hxx>
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index d961504..fe8fad9 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -21,7 +21,7 @@
#include <vcl/group.hxx>
#include <svtools/stdctrl.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svx/SvxColorValueSet.hxx>
#include <svx/dlgctrl.hxx>
#include <editeng/brushitem.hxx>
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 1e39b37..f8265ab 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -24,7 +24,7 @@
#include <salhelper/thread.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index d249711..a8fd599 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -23,7 +23,7 @@
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/field.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <sfx2/tabdlg.hxx>
class SvxCropExample : public vcl::Window
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index c9b5b2a..8efbd0f 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -36,7 +36,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/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 28959c4..dc79057 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -21,7 +21,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/printer.hxx>
#include <tools/resary.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <sfx2/viewsh.hxx>
#include <svl/itemiter.hxx>
#include <svl/languageoptions.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx
index 6859063..677f28a 100644
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -117,7 +117,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/keycod.hxx>
#include <vcl/keycodes.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx
index 347d409..ea8acca 100644
--- a/dbaccess/inc/pch/precompiled_dbmm.hxx
+++ b/dbaccess/inc/pch/precompiled_dbmm.hxx
@@ -110,7 +110,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/impdel.hxx>
#include <vcl/inputctx.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 3863153..340e646 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -31,7 +31,7 @@
#include <vcl/fixed.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/cvtgrf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svtools/grfmgr.hxx>
#include "callbacks.hxx"
#include <memory>
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index caa0e1c..71960b1 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/ui/XImageManager.hpp>
#include <comphelper/processfactory.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/help.hxx>
#include <unotools/historyoptions.hxx>
#include <comphelper/sequenceashashmap.hxx>
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx
index 3d5baa3..67bf178 100644
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -128,7 +128,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/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index b3756d1..470bdfc 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
@@ -62,7 +62,7 @@
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/inputctx.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/outdev.hxx>
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index 89422be..51bbe2b 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -18,7 +18,7 @@
*/
#include <drawinglayer/attribute/fillgraphicattribute.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
namespace drawinglayer
{
diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
index 6efece2..214c150 100644
--- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
@@ -20,7 +20,7 @@
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <drawinglayer/attribute/fillgraphicattribute.hxx>
#include <rtl/instance.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index be7ff65..781768d 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -32,7 +32,7 @@
// helper class for animated graphics
#include <vcl/animate.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/metaact.hxx>
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index ec18be6..dbdd2c5 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -30,7 +30,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
index 4f631c9..58b73d1 100644
--- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
@@ -25,7 +25,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 86591ac..af92c61 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -58,7 +58,7 @@
#include <vcl/dibtools.hxx>
// for PDFExtOutDevData Graphic support
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/formpdfexport.hxx>
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index b6edfa4..fda9de5 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -49,7 +49,7 @@
#include <drawinglayer/primitive2d/svggradientprimitive2d.hxx>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include "getdigitlanguage.hxx"
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index 38b53d0..cf874bc 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -34,7 +34,7 @@
#include <vcl/bitmapex.hxx>
#include <drawinglayer/attribute/sdrsceneattribute3d.hxx>
#include <drawinglayer/attribute/sdrlightingattribute3d.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 6ea416f..cc6661e 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -105,7 +105,7 @@
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
#include <vcl/impdel.hxx>
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index eb4921c..95636f3 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -37,7 +37,7 @@
#include <editeng/flditem.hxx>
#include <editeng/txtrange.hxx>
#include <editeng/cmapitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <editeng/autokernitem.hxx>
#include <editeng/contouritem.hxx>
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 290afd9..b8d0ed1 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -42,7 +42,7 @@
#include <editeng/numitem.hxx>
#include <editeng/brushitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/intitem.hxx>
#include "svl/sharedstringpool.hxx"
#include <unotools/fontcvt.hxx>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index bd68ff0..678f4b3 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -30,7 +30,7 @@
#include <editeng/editrids.hrc>
#include <editeng/numdef.hxx>
#include <editeng/eeitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <editeng/unolingu.hxx>
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 0643fd7..3ae486d 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -44,7 +44,7 @@
#include <vcl/metric.hxx>
#include <editeng/numitem.hxx>
#include <editeng/adjustitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
#include <svtools/grfmgr.hxx>
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 787d575..2064939 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -22,7 +22,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svtools/grfmgr.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/filter/qa/cppunit/filters-dxf-test.cxx b/filter/qa/cppunit/filters-dxf-test.cxx
index c2ebdb9..47659e0 100644
--- a/filter/qa/cppunit/filters-dxf-test.cxx
+++ b/filter/qa/cppunit/filters-dxf-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-eps-test.cxx b/filter/qa/cppunit/filters-eps-test.cxx
index 984a30d..5f842d0 100644
--- a/filter/qa/cppunit/filters-eps-test.cxx
+++ b/filter/qa/cppunit/filters-eps-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-met-test.cxx b/filter/qa/cppunit/filters-met-test.cxx
index ee990d3..4918078 100644
--- a/filter/qa/cppunit/filters-met-test.cxx
+++ b/filter/qa/cppunit/filters-met-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-pcd-test.cxx b/filter/qa/cppunit/filters-pcd-test.cxx
index c7f3e7c..caec180 100644
--- a/filter/qa/cppunit/filters-pcd-test.cxx
+++ b/filter/qa/cppunit/filters-pcd-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-pcx-test.cxx b/filter/qa/cppunit/filters-pcx-test.cxx
index bc7ef55..f3e8ac9 100644
--- a/filter/qa/cppunit/filters-pcx-test.cxx
+++ b/filter/qa/cppunit/filters-pcx-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx
index ab4170a..ec8d0e0 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -13,7 +13,7 @@
#include <test/mtfxmldump.hxx>
#include <test/xmltesttools.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/metaactiontypes.hxx>
#include <osl/file.hxx>
diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx
index 349f09d..2ad4b8c 100644
--- a/filter/qa/cppunit/filters-ppm-test.cxx
+++ b/filter/qa/cppunit/filters-ppm-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-psd-test.cxx b/filter/qa/cppunit/filters-psd-test.cxx
index 27a696a..5e934c6 100644
--- a/filter/qa/cppunit/filters-psd-test.cxx
+++ b/filter/qa/cppunit/filters-psd-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-ras-test.cxx b/filter/qa/cppunit/filters-ras-test.cxx
index 8af8660..077fc43 100644
--- a/filter/qa/cppunit/filters-ras-test.cxx
+++ b/filter/qa/cppunit/filters-ras-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx
index 9169718..f455226 100644
--- a/filter/qa/cppunit/filters-tga-test.cxx
+++ b/filter/qa/cppunit/filters-tga-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx
index e2c6d5e..dc12c81 100644
--- a/filter/qa/cppunit/filters-tiff-test.cxx
+++ b/filter/qa/cppunit/filters-tiff-test.cxx
@@ -11,7 +11,7 @@
#include <test/bootstrapfixture.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 51f47ba..0c0bfca 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -18,7 +18,7 @@
*/
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/window.hxx>
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index b0c44d0..96e1137 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -26,7 +26,7 @@
#include <vcl/salbtype.hxx>
#include <tools/poly.hxx>
#include <tools/fract.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/gradient.hxx>
#include <vcl/hatch.hxx>
#include <vcl/metric.hxx>
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index 90cc26e..1878cda 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -19,7 +19,7 @@
#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/msgbox.hxx>
#include <svl/solar.hrc>
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 144ac02..28e231f 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -19,7 +19,7 @@
#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/msgbox.hxx>
#include <svl/solar.hrc>
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 2d4248d..5000ae7 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -24,7 +24,7 @@
#include <math.h>
#include <vcl/bmpacc.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/gradient.hxx>
#include <vcl/hatch.hxx>
#include <vcl/metric.hxx>
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index 5e9cb90..cae8ea8 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -19,7 +19,7 @@
#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/msgbox.hxx>
#include <svl/solar.hrc>
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index ac2252c..4ab7399 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -23,7 +23,7 @@
#include <tools/fract.hxx>
#include <vcl/svapp.hxx>
#include <vcl/metaact.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/region.hxx>
#include <vcl/metric.hxx>
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index ea4c144..0d9f0a7 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -18,7 +18,7 @@
*/
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/fltcall.hxx>
#include <vcl/FilterConfigItem.hxx>
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 239c66d..e793d31 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -18,7 +18,7 @@
*/
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/bmpacc.hxx>
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index 524f1dd..734bc19 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -18,7 +18,7 @@
*/
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/fltcall.hxx>
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index b71aa03..27f5a53 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -22,7 +22,7 @@
#include <osl/endian.h>
#include <vcl/virdev.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <tools/stream.hxx>
#include <chart.hxx>
#include <main.hxx>
diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx
index 69d2e8c..e3c3450 100644
--- a/filter/source/graphicfilter/idxf/idxf.cxx
+++ b/filter/source/graphicfilter/idxf/idxf.cxx
@@ -20,7 +20,7 @@
#include <string.h>
#include <vcl/gdimtf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/virdev.hxx>
#include "dxf2mtf.hxx"
#include <math.h>
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 02d4259..aec902e 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -26,7 +26,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/graph.h>
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
#include <vcl/cvtgrf.hxx>
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 9ec66e9..26b7320 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -20,7 +20,7 @@
#include <osl/thread.h>
#include <tools/poly.hxx>
#include <tools/fract.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/virdev.hxx>
#include <vcl/lineinfo.hxx>
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index a7f5d11..4436238 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <vcl/FilterConfigItem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
//============================ PBMReader ==================================
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index bb8da45..9186696 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -19,7 +19,7 @@
#include "rtl/alloc.h"
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/svapp.hxx>
#include <vcl/fltcall.hxx>
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 33308a0..47a72b4 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -18,7 +18,7 @@
*/
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
class FilterConfigItem;
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index d682ec6..9b959d2 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -20,7 +20,7 @@
#include <string.h>
#include <osl/thread.h>
#include <vcl/bmpacc.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <tools/poly.hxx>
#include <tools/fract.hxx>
#include <vcl/virdev.hxx>
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index a8ec8d5..3c71450 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -18,7 +18,7 @@
*/
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/outdev.hxx>
#include <tools/fract.hxx>
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 8141668..14aba38 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -18,7 +18,7 @@
*/
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
class FilterConfigItem;
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index e36146b..7cb2233 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -18,7 +18,7 @@
*/
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
class FilterConfigItem;
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index c332125..10b1824 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <vcl/FilterConfigItem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/animate.hxx>
#include <tools/fract.hxx>
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 25d4dcf..2c3cdd3 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -30,7 +30,7 @@
#include <svx/svdmodel.hxx>
#include <editeng/outlobj.hxx>
#include <vcl/gradient.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index d325345..4a54dc14 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -25,7 +25,7 @@
#include <vcl/outdev.hxx>
#include <tools/poly.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <tools/debug.hxx>
#include <svx/fmdpage.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index f0e6fd2..bcc1bde 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <fstream>
#include <vcl/dibtools.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/image.hxx>
#include <map>
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 74d4ee3..6ec9d09 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -36,7 +36,7 @@
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
#include <unotools/streamwrap.hxx>
#include <sax/tools/converter.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/virdev.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index 7d30b79..61d58c4 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -66,7 +66,7 @@
#include <vcl/dllapi.h>
#include <vcl/edit.hxx>
#include <vcl/event.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/image.hxx>
#include <vcl/inputctx.hxx>
#include <vcl/keycodes.hxx>
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index 89fccde..acbbb9e 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -114,7 +114,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/impdel.hxx>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 7d35e5c..321cdd9 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -128,7 +128,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/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx
index 3b56204..4f8b486 100644
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -129,7 +129,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/i18nhelp.hxx>
#include <vcl/idle.hxx>
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index f905bc4..af6cbf9 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -28,7 +28,7 @@
#include <comphelper/getexpandeduri.hxx>
#include <comphelper/processfactory.hxx>
#include <vcl/dibtools.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index fef0d1d..50969f8 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -37,7 +37,7 @@
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 11d6163..12accaa 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -34,7 +34,7 @@
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 5dd73a6..6aca75c 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -36,7 +36,7 @@
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/toolbox.hxx>
diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
index 4d4cce6..18e7da1 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 26261d2..4d3ef5b 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 28ae918..20470a5 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 741507a..55c3790 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 09de00e..e571055 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 29ac2dc..5a5161f 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 bd8a164..b844116 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 0149813..8078817 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 e7b4897..191c356 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 9757cd0..f636dd4 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 63e8a89..d92ade7 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 cf44b1c..1fb0411 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 eca6556..df5100e 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 d596d22..c03b0e7 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 00e2f0d..3d47e75 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 37dfb30..af98775 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 bc9f871..fab77b5 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 b6b66fc..e803004 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
similarity index 100%
rename from include/vcl/graph.hxx
rename to include/vcl/graphic.hxx
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index a1d987f..9b3e3e7 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 b3da273..0f49ede 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 476711a..0834e48 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 4fdc6a8..cefd455 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
{
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 8adfabd..9aab728 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -87,7 +87,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/svgdata.hxx>
#include <basegfx/basegfxdllapi.h>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index b744bb1..46d5489 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -71,7 +71,7 @@
#include <svx/svdtrans.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/fltrcfg.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/svapp.hxx>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 8c90ffa..9c87757 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -71,7 +71,7 @@
#include <tools/stream.hxx>
#include <unotools/fontdefs.hxx>
#include <vcl/cvtgrf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/settings.hxx>
#include <svtools/grfmgr.hxx>
#include <rtl/strbuf.hxx>
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index c20d69d..9934bfa 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -81,7 +81,7 @@
#include <sot/exchange.hxx>
#include <vcl/cvtgrf.hxx>
#include <unotools/fontcvt.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/outdev.hxx>
#include <svtools/grfmgr.hxx>
#include <rtl/strbuf.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx
index 8851302..334476e 100644
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -134,7 +134,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/impdel.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index cc70eb1..76e855e 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -143,7 +143,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/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 6dec7b7..fe98093 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_INC_DRWLAYER_HXX
#define INCLUDED_SC_INC_DRWLAYER_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svx/fmmodel.hxx>
#include <svx/svdundo.hxx>
#include "global.hxx"
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index b50cff4..6009bb0 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -146,7 +146,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
#include <vcl/impdel.hxx>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 60dfa11..1adb5c2 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -95,7 +95,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index d14e1f6..d86a98d 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -52,7 +52,7 @@
#include <editeng/flditem.hxx>
#include <svx/xflclit.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#include <sot/exchange.hxx>
diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx
index 379493f..4a44840 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -19,7 +19,7 @@
#include "xipage.hxx"
#include <svl/itemset.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include "scitems.hxx"
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index a65b3e5..359eb44 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -20,7 +20,7 @@
#include <fstream>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <map>
using namespace com::sun::star;
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index ba25d61..8a9fac9 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_EEPARSER_HXX
#include <tools/gen.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/itemset.hxx>
#include <editeng/editdata.hxx>
#include <address.hxx>
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 2113e1e..2ec5d20 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_XEESCHER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_XEESCHER_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <filter/msfilter/escherex.hxx>
#include "xcl97rec.hxx"
#include "xlescher.hxx"
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index eb27f38..f6ba2ea 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -22,7 +22,7 @@
#include <filter/msfilter/msdffimp.hxx>
#include <svx/svdobj.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include "xlescher.hxx"
#include "xiroot.hxx"
#include "xistring.hxx"
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index bde0a4d..dd0d6d1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -40,7 +40,7 @@
#include <svl/urlbmk.hxx>
#include <svl/sharedstringpool.hxx>
#include <vcl/cursor.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/hatch.hxx>
#include <vcl/settings.hxx>
#include <sot/formats.hxx>
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 027f4f8..917114a 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -30,7 +30,7 @@
#include <comphelper/classids.hxx>
#include <sot/formats.hxx>
#include <sot/storage.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/virdev.hxx>
#include <vcl/msgbox.hxx>
#include <tools/urlobj.hxx>
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 260f4f8..461021d 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -42,7 +42,7 @@
#include <svl/ptitem.hxx>
#include <svl/stritem.hxx>
#include <svtools/transfer.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index a24a582..f8d6e16 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 f8fbba2..4b05052 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 9e5c4a7..c0a2c86 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 b24d797..02ffe21 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 450b835..504957f 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 2d07d78..07863e3 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 214d5bf..784bac0 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 3b0b102..c341a2c 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 2f27d91..877e523 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 76a6369..1817135 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 af9a9ea..f976490 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 cebb95b..720ff6d 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 46abdff..f8f3fd0 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 9cd5e90..c483bad 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>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index d599a0d..3d24679 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -105,7 +105,7 @@
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/gradient.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/help.hxx>
#include <vcl/idle.hxx>
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 74ef914..e39c5c0 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -30,7 +30,7 @@
#include <vcl/msgbox.hxx>
#include <sfx2/lnkbase.hxx>
#include <sfx2/app.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/sfx2/source/control/templatecontaineritem.cxx b/sfx2/source/control/templatecontaineritem.cxx
index 5690a2e..9caed24 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -21,7 +21,7 @@
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <sfx2/templateviewitem.hxx>
#include <vcl/button.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
using namespace basegfx;
using namespace basegfx::tools;
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index 950c326..4163539 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -19,7 +19,7 @@
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <vcl/button.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#define SUBTITLE_SCALE_FACTOR 0.85
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index a866b0d..b085229 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -34,7 +34,7 @@
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <vcl/button.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/svapp.hxx>
#include <vcl/texteng.hxx>
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index f4a49ef..8109d2c 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -21,7 +21,7 @@
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 0820748..ff5e875 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -34,7 +34,7 @@
#include <osl/thread.h>
#include <vcl/gdimtf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 908c366..0a97499 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -41,7 +41,7 @@
#include <svl/stritem.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <osl/file.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <svl/lngmisc.hxx>
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index f1548fe..8bb0bdd 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -26,7 +26,7 @@
#include <comphelper/processfactory.hxx>
#include <svl/stritem.hxx>
#include <tools/debug.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index d6f824f..c5875c0 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -126,7 +126,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/impdel.hxx>
#include <vcl/inputctx.hxx>
#include <vcl/keycod.hxx>
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 684c07a..5c95f29 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -40,7 +40,7 @@
#include <vcl/virdev.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/animate.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index e3674d98..3a7b016 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -30,7 +30,7 @@
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index bcd65e5..bb938d8 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -118,7 +118,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/i18nhelp.hxx>
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index ebe0d29..70abae2 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -37,7 +37,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <rtl/ustrbuf.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index a762bde..1001080 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/graphic/GraphicType.hpp>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/svapp.hxx>
#include <memory>
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index 24045bd9..7d3cdcb 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/propertysetinfo.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#define MIMETYPE_BMP "image/x-MS-bmp"
#define MIMETYPE_GIF "image/gif"
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index ccfea39..4df0ca3 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -22,7 +22,7 @@
#include <com/sun/star/graphic/GraphicType.hpp>
#include <com/sun/star/graphic/XGraphicTransformer.hpp>
#include <vcl/dibtools.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include "graphic.hxx"
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index f7de053..bd5eda5 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVTOOLS_SOURCE_GRAPHIC_GRFCACHE_HXX
#define INCLUDED_SVTOOLS_SOURCE_GRAPHIC_GRFCACHE_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/timer.hxx>
#include <list>
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 0bca9ee..2cee3ba 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -31,7 +31,7 @@
#include <sot/storage.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/gdimtf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index f6fb07e..52689a2 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -23,7 +23,7 @@
#include <sot/storage.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/gdimtf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 0f4ed9b..d9b9cce 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -31,7 +31,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/svapp.hxx>
#include <svtools/treelistbox.hxx>
#include <svtools/treelistentry.hxx>
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index db467e5..6bee33c 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 8398a7d..720446d 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 4c74ffb..a040847 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 ac6c377..ac46acd 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 3f9c22b..cd402c5 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 3f65607..9e6567a 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 aca7ecd..7af5341 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 953f062..7b3984a 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 58965e4..045d398 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 78d4a7c..9d0eacf 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 d2c9943..3238cb6 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 dafb10e..e05c0d3 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 8abfe5c..9ef9262 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>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index c649d70..152683f 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -141,7 +141,7 @@
#include <vcl/gfxlink.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/hatch.hxx>
#include <vcl/idle.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 7c849dd..94155cba 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -114,7 +114,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/image.hxx>
#include <vcl/layout.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index cffda4d..9d818e9 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -142,7 +142,7 @@
#include <vcl/gfxlink.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/group.hxx>
#include <vcl/hatch.hxx>
#include <vcl/help.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index ce7e63f..c2dc3e1 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -136,7 +136,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/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 8446e63..8d12363 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -42,7 +42,7 @@
#include <UndoInsert.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <viscrs.hxx>
using namespace com::sun::star;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 2092fe8..44fe09d 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -19,7 +19,7 @@
#include <hintids.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <sot/formats.hxx>
#include <sot/storage.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index d7aabd1..2193796 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -50,7 +50,7 @@
#include <IDocumentLinksAdministration.hxx>
#include <comphelper/classids.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <sot/formats.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index d28a18b..01026dc 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -20,7 +20,7 @@
#include <hintids.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <editeng/brushitem.hxx>
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index becc8ad..2b8fe07 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -22,7 +22,7 @@
#include <hints.hxx>
#include <vcl/graphicfilter.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/urihelper.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/wghtitem.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 1ec230e..1342058 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -36,7 +36,7 @@
#include "../inc/msfilter.hxx"
#include <expfld.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <boost/optional.hpp>
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 2a2eaab..f5b85c9 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -23,7 +23,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <unotools/configmgr.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <map>
#include <sal/log.hxx>
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index e738e7c..27ff359 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -18,7 +18,7 @@
*/
#include "hintids.hxx"
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/settings.hxx>
#include <sfx2/htmlmode.hxx>
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index af8329e..c173adc 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -22,7 +22,7 @@
#include <hintids.hxx>
#include <swerror.h>
#include <vcl/wrkwin.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svtools/ehdl.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
#include <svx/svdobj.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 12d0466..15d6fcd 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -47,7 +47,7 @@
#include <svl/stritem.hxx>
#include <svtools/imap.hxx>
#include <sot/storage.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/urihelper.hxx>
#include <svx/svdmodel.hxx>
#include <svx/xexch.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 277934b..f83359d 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/i18n/UnicodeScript.hpp>
#include <vcl/help.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/msgbox.hxx>
#include <sot/storage.hxx>
#include <svl/macitem.hxx>
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index 07241c8..e230ace 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ROMENU_HXX
#include <editeng/brushitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/menu.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index 0da911b..aaa4601 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -30,7 +30,7 @@
#include <editeng/frmdiritem.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/builder.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include <tgrditem.hxx>
diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx
index 442147a..1f4d446 100644
--- a/sw/source/uibase/inc/bmpwin.hxx
+++ b/sw/source/uibase/inc/bmpwin.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BMPWIN_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_BMPWIN_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/window.hxx>
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 4b8b238..73452d9 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -22,7 +22,7 @@
#include <sfx2/objsh.hxx>
#include <svtools/transfer.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <sfx2/lnkbase.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 2c609e1..f6d6b75 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -37,7 +37,7 @@
#include <editeng/langitem.hxx>
#include <svx/clipfmtitem.hxx>
#include <svx/contdlg.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/slstitm.hxx>
#include <vcl/msgbox.hxx>
#include <svl/ptitem.hxx>
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 0cd0cc3..49ce99d 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -24,7 +24,7 @@
#include <hintids.hxx>
#include <comphelper/string.hxx>
#include <officecfg/Office/Common.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/inputctx.hxx>
#include <basic/sbxobj.hxx>
#include <svl/eitem.hxx>
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 1218818..e45bb4b 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -20,7 +20,7 @@
#include <config_features.h>
#include "hintids.hxx"
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <svl/srchitem.hxx>
#include <SwSpellDialogChildWindow.hxx>
#include <svl/eitem.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index b98305f..7de2e33 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -46,7 +46,7 @@
#include <editeng/formatbreakitem.hxx>
#include <editeng/svxacorr.hxx>
#include <editeng/ulspitem.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/printer.hxx>
#include <unotools/charclass.hxx>
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index cf0c1ac..bc6a1b6 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -46,7 +46,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/image.hxx>
#include "tree/treecontrol.hxx"
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index e7ae820..ddd9e0e 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -41,7 +41,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/image.hxx>
#include <cppuhelper/implbase.hxx>
#include <algorithm>
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index c2353f0..6c7a6be 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -37,7 +37,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/image.hxx>
#include <toolkit/controls/geometrycontrolmodel.hxx>
#include <toolkit/controls/controlmodelcontainerbase.hxx>
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index f657be0..b604f7f 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -46,7 +46,7 @@
#include <toolkit/awt/vclxfont.hxx>
#include <toolkit/controls/unocontrolcontainer.hxx>
#include <toolkit/controls/unocontrolcontainermodel.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/awt/Toolkit.hpp>
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx
index 344bb4c..ab7ed26 100644
--- a/vbahelper/inc/pch/precompiled_msforms.hxx
+++ b/vbahelper/inc/pch/precompiled_msforms.hxx
@@ -117,7 +117,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/image.hxx>
#include <vcl/impdel.hxx>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index da80ab6..5b5c969 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -275,7 +275,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/gdi/gdimetafiletools \
vcl/source/gdi/gfxlink \
vcl/source/gdi/gradient \
- vcl/source/gdi/graph \
+ vcl/source/gdi/graphic \
vcl/source/gdi/graphictools \
vcl/source/gdi/hatch \
vcl/source/gdi/impanmvw \
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 1bb0f2f..8c31f20 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -151,7 +151,7 @@
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/gradient.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/help.hxx>
#include <vcl/i18nhelp.hxx>
diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx
index b6489a0..d8b7421 100644
--- a/vcl/source/filter/igif/gifread.hxx
+++ b/vcl/source/filter/igif/gifread.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX
#define INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#ifdef _GIFPRIVATE
diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
index 3794a37..5164dc8 100644
--- a/vcl/source/filter/ixbm/xbmread.hxx
+++ b/vcl/source/filter/ixbm/xbmread.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX
#define INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/bmpacc.hxx>
#ifdef _XBMPRIVATE
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index cfc7956..5179f77 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -18,7 +18,7 @@
*/
#include <vcl/bmpacc.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include "rgbtable.hxx"
#define _XPMPRIVATE
#include "xpmread.hxx"
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 2f440f6..bbf225d 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX
#include <osl/endian.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/fltcall.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index c45b697..d99c63c 100644
--- a/vcl/source/filter/jpeg/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGREADER_HXX
#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGREADER_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/fltcall.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/vcl/source/filter/jpeg/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx
index 0711f23..e4c8078 100644
--- a/vcl/source/filter/jpeg/JpegTransform.hxx
+++ b/vcl/source/filter/jpeg/JpegTransform.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
class JpegTransform
{
diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx
index edfa8ac..c7e2913 100644
--- a/vcl/source/filter/jpeg/JpegWriter.hxx
+++ b/vcl/source/filter/jpeg/JpegWriter.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGWRITER_HXX
#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGWRITER_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/fltcall.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx
index 701a8ea..ef10bc7 100644
--- a/vcl/source/filter/jpeg/jpeg.hxx
+++ b/vcl/source/filter/jpeg/jpeg.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_HXX
#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_HXX
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/fltcall.hxx>
#include <com/sun/star/uno/Sequence.h>
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 18e2d2c..36b2f5d 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -19,7 +19,7 @@
#include <rtl/math.hxx>
#include <osl/endian.h>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <tools/poly.hxx>
#include <tools/fract.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx
index a7aa6fb..962fc53 100644
--- a/vcl/source/filter/wmf/emfwr.hxx
+++ b/vcl/source/filter/wmf/emfwr.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_SOURCE_FILTER_WMF_EMFWR_HXX
#include <vcl/metaact.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/virdev.hxx>
#include <vcl/fltcall.hxx>
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index cce3aab..7bd5f7d 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_SOURCE_FILTER_WMF_WINMTF_HXX
#include <sot/object.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <basegfx/tools/b2dclipstate.hxx>
#include <vcl/font.hxx>
#include <vcl/bmpacc.hxx>
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index 32cf5cf..5c83e91 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_SOURCE_FILTER_WMF_WMFWR_HXX
#include <vcl/metaact.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/virdev.hxx>
#include <vcl/fltcall.hxx>
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 07ceea3..71e86bf 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -26,7 +26,7 @@
#include <tools/helpers.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/lineinfo.hxx>
#include <rtl/strbuf.hxx>
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 1756a03..f841360 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -24,7 +24,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/tempfile.hxx>
#include <ucbhelper/content.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/cvtgrf.hxx>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graphic.cxx
similarity index 99%
rename from vcl/source/gdi/graph.cxx
rename to vcl/source/gdi/graphic.cxx
index 5c23e0a..e55a440 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graphic.cxx
@@ -19,7 +19,7 @@
#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/metaact.hxx>
#include <impgraph.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 21d2119..d77d1b0 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -33,7 +33,7 @@
#include <vcl/virdev.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/cvtgrf.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/graphic.hxx>
#include <vcl/metaact.hxx>
#include <impgraph.hxx>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 0466cfb..75ce7de 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -18,7 +18,7 @@
*/
#include "vcl/pdfextoutdevdata.hxx"
-#include "vcl/graph.hxx"
+#include <vcl/graphic.hxx>
#include "vcl/outdev.hxx"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list