diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-03-06 18:22:36 +1100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-03-15 21:25:56 +0000 |
| commit | 90b670f5bfd95e879426b73a14c8347ae3bc80b2 (patch) | |
| tree | 56bfd101856edb75ccaa975da23ace09fe304303 | |
| parent | 3b384f0c6e3effeeb7226798b57020b3a68b20c4 (diff) | |
vcl: move graph.[hx]xx to graphic.[hc]xx
It's IMO a bit confusing to see a "graph" header that doesn't
strictly deal with graphs, but graphics.
Backporting to 5.1 series to allow for easier backporting of
other potential hotfixes.
Change-Id: Ic37c6cd78e23d05939486f98667144c4453bb0a3
Reviewed-on: https://gerrit.libreoffice.org/22949
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
236 files changed, 235 insertions, 235 deletions
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 71b57e5079f8..2b6678119bb1 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 cd2eadf9e9a8..11dae9f54295 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 bf54b01e042b..9d6dd04096ae 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 083cb60be74b..a720c8eeafd7 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 4aade3c89233..33170a870c19 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 e3cc4809bccb..3065637b639e 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 850b72f1cb3d..5ee29fbbe15f 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 4d6305c8ca12..f1f811976386 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 b6da33ebce83..c1f101ba93db 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 100657ccf8eb..59d8731cc851 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 7c2bea89b403..89bc5d1dd5df 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 350a5937b601..bfb39a651815 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 cedab3995913..2f787d92e019 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 d92caaac7848..1eb84b617980 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 6cfece93b5dc..0a8a07b97fc5 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 963285af6870..cfdd90f7ebad 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 68e7e4ffd4b8..8853e805eca1 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 271bb625d52e..4ecf8ea198b1 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 4715e790d83e..aef43c1d8ff5 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 c1d76b2af59e..59d160dbe4ae 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 a2f79c6ff387..4a79b280cfc4 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 ab23cf8c4a81..38dad7fcd55b 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 d961504f5738..fe8fad937198 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 1e39b37171b8..f8265aba40d3 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 d2497117c405..a8fd5998aaad 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 c9b5b2a9f56e..8efbd0fc951d 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 28959c48b8a4..dc7905706b34 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 68590630322c..677f28a2364f 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 347d409ed0ea..ea8acca59f94 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 38631533ea54..340e646c300c 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 caa0e1c6049d..71960b1cf028 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 3d5baa38b6a8..67bf1788f686 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 b3756d1a94dd..470bdfcec1f6 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 89422befac87..51bbe2b6f9ea 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 6efece221617..214c15048734 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 be7ff6541fa7..781768d2dddb 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 ec18be6997b0..dbdd2c558b81 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 4f631c9788f1..58b73d1a1572 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 86591ac593c8..af92c617e1ea 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 b6edfa4a3d7d..fda9de556598 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 38b53d00d045..cf874bcbb8ba 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 6ea416f5b5da..cc6661e63908 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 eb4921c6ffa7..95636f355f63 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 290afd940b27..b8d0ed1943cb 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 bd68ff001874..678f4b3c305e 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 0643fd742a6d..3ae486dade19 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 787d575a702c..20649398115c 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 c2ebdb96c915..47659e0df284 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 984a30d81c7b..5f842d06dbc9 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 ee990d38379d..491807867337 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 c7f3e7cab583..caec180ae2ce 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 bc7ef55d5691..f3e8ac978fbc 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 ab4170a32fcf..ec8d0e042a56 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 349f09d155bc..2ad4b8c76d05 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 27a696a18b18..5e934c64c2a2 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 8af8660ea695..077fc4349963 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 91697181fdf3..f45522603951 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 e2c6d5e36c5f..dc12c81d9783 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 51f47babab4f..0c0bfcae28f9 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 b0c44d0a4ec0..96e1137558de 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 90cc26ec6d2c..1878cdad7345 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 144ac025c1c7..28e231fdd9d7 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 2d4248d9b0c5..5000ae76c93b 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 5e9cb90dc7ee..cae8ea800dfd 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 ac2252cc4572..4ab73991f79c 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 ea4c1448e48d..0d9f0a774b85 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 239c66d2c4e9..e793d3139966 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 524f1ddac9c0..734bc1907ad6 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 b71aa03c0d60..27f5a5314ffb 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 69d2e8c6ea57..e3c34502269a 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 02d42597a134..aec902e88888 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 9ec66e92268c..26b73206ec01 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 a7f5d1137ffc..44362384fb21 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 bb8da45282ef..918669672eb1 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 33308a028c08..47a72b4eb202 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 d682ec6716c1..9b959d206d01 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 a8ec8d5e337b..3c71450c9c9c 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 814166874585..14aba380c5cf 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 e36146b571db..7cb2233104c6 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 c33212569b5c..10b1824ccde4 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 25d4dcf8dc91..2c3cdd3be950 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 d325345254cb..4a54dc144a53 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 f0e6fd2c3f5b..bcc1bdef1480 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 74d4ee35a580..6ec9d09a844a 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 7d30b79dc61c..61d58c439fa1 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 89fccde2bdd7..acbbb9e26657 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 7d35e5c99b68..321cdd93201f 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 3b562047f237..4f8b4867f11f 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 f905bc4af287..af6cbf904d45 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 fef0d1da3c9e..50969f837768 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 11d6163c9e29..12accaa2406f 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 5dd73a65a47e..6aca75c54461 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 4d4cce6fcc27..18e7da12c9a1 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 26261d2e09c3..4d3ef5b293fe 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -29,7 +29,7 @@ #include <tools/gen.hxx> #include <tools/color.hxx> #include <tools/contnr.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/outdev.hxx> #include <tools/link.hxx> #include <rsc/rscsfx.hxx> diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 28ae9184c443..20470a514ec1 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -37,7 +37,7 @@ #include <tools/color.hxx> #include <tools/gen.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svx/msdffdef.hxx> #include <filter/msfilter/dffpropset.hxx> diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 741507af7d89..55c3790622fd 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -29,7 +29,7 @@ #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/button.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/docfilt.hxx> diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx index 09de00ea7b06..e5710556b413 100644 --- a/include/svtools/DocumentToGraphicRenderer.hxx +++ b/include/svtools/DocumentToGraphicRenderer.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/view/XRenderable.hpp> #include <com/sun/star/awt/XToolkit.hpp> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svtools/svtdllapi.h> diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index 29ac2dcd011c..5a5161f71d98 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -23,7 +23,7 @@ #include <svtools/svtdllapi.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/io/XInputStream.hpp> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <tools/mapunit.hxx> #include <rtl/ustring.hxx> #include <memory> diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index bd8a16469cdd..b8441169657a 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVTOOLS_GRFMGR_HXX #define INCLUDED_SVTOOLS_GRFMGR_HXX -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svtools/svtdllapi.h> #include <o3tl/typed_flags_set.hxx> diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 0149813db49a..8078817a4563 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -24,7 +24,7 @@ #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svx/svxdllapi.h> #include <svx/dlgctrl.hxx> diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index e7b4897bbe9e..191c356c6d3b 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -22,7 +22,7 @@ #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/lstbox.hxx> #include <vcl/field.hxx> #include <vcl/slider.hxx> diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 9757cd0e7d38..f636dd4d84c5 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -23,7 +23,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/svxdllapi.h> #include <svx/rectenum.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svx/xtable.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 63e8a8932e91..d92ade706d78 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_GALCTRL_HXX #include <vcl/dialog.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/button.hxx> diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index cf44b1cf63ac..1fb0411f6d30 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SVX_GRAPHCTL_HXX #include <vcl/ctrl.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svx/svxdllapi.h> #include <svx/svdview.hxx> diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx index eca65563ef69..df5100e6bf5b 100644 --- a/include/svx/graphichelper.hxx +++ b/include/svx/graphichelper.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_GRAPHICHELPER_HXX #define INCLUDED_SVX_GRAPHICHELPER_HXX -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svx/svxdllapi.h> #include <com/sun/star/drawing/XShape.hpp> diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index d596d22a256e..c03b0e767c4a 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_SVDOGRAF_HXX #include <com/sun/star/io/XInputStream.hpp> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svx/svdorect.hxx> #include <svtools/grfmgr.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx index 00e2f0d1c089..3d47e752b0f7 100644 --- a/include/svx/svxgrahicitem.hxx +++ b/include/svx/svxgrahicitem.hxx @@ -23,7 +23,7 @@ #include <svl/poolitem.hxx> #include <svx/svxdllapi.h> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem { diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 37dfb307701c..af9877520337 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_XOUTBMP_HXX #define INCLUDED_SVX_XOUTBMP_HXX -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <svx/svxdllapi.h> diff --git a/include/vcl/GraphicNativeMetadata.hxx b/include/vcl/GraphicNativeMetadata.hxx index bc9f871cc06d..fab77b55d6ca 100644 --- a/include/vcl/GraphicNativeMetadata.hxx +++ b/include/vcl/GraphicNativeMetadata.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_GRAPHICNATIVEMETADATA_HXX #define INCLUDED_VCL_GRAPHICNATIVEMETADATA_HXX -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> class VCL_DLLPUBLIC GraphicNativeMetadata { diff --git a/include/vcl/GraphicNativeTransform.hxx b/include/vcl/GraphicNativeTransform.hxx index b6b66fc75f98..e803004b4c4d 100644 --- a/include/vcl/GraphicNativeTransform.hxx +++ b/include/vcl/GraphicNativeTransform.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_GRAPHICNATIVETRANSFORM_HXX #define INCLUDED_VCL_GRAPHICNATIVETRANSFORM_HXX -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> class VCL_DLLPUBLIC GraphicNativeTransform { diff --git a/include/vcl/graph.hxx b/include/vcl/graphic.hxx index 34c65909207e..34c65909207e 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graphic.hxx diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index a1d987f7fbe5..9b3e3e746472 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -24,7 +24,7 @@ #include <tools/urlobj.hxx> #include <vcl/dllapi.h> #include <vcl/field.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <o3tl/typed_flags_set.hxx> #include <com/sun/star/uno/Sequence.h> diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index b3da2733469a..0f49edebed71 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -25,7 +25,7 @@ #include <rtl/string.hxx> #include <tools/color.hxx> #include <tools/poly.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <memory> #include <vector> diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 476711af78ef..0834e48528b6 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -29,7 +29,7 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/region.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/outdev.hxx> #include <vcl/gdimtf.hxx> #include <vcl/gfxlink.hxx> diff --git a/include/vcl/salctype.hxx b/include/vcl/salctype.hxx index 4fdc6a8ba75a..cefd4551dbba 100644 --- a/include/vcl/salctype.hxx +++ b/include/vcl/salctype.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> enum class ConvertDataFormat { diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 8adfabdb6467..9aab7282500d 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 b744bb142cac..46d54893cea0 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 8c90ffaa982b..9c877574657b 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 c20d69dcdbb8..9934bfa8d387 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 8851302997b5..334476e8c792 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 cc70eb1129d0..76e855e56496 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 6dec7b7c4a83..fe98093240a7 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 b50cff4c089c..6009bb0236a9 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 60dfa11c8853..1adb5c236920 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 d14e1f608e88..d86a98d80db8 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 379493f6c411..4a448407aba6 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 a65b3e586e98..359eb44435c2 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 ba25d617669a..8a9fac9f0d4b 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 2113e1e52ae2..2ec5d20035c7 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 eb27f388ea7d..f6ba2eaf62c8 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 bde0a4db361f..dd0d6d1d0fb5 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 027f4f86ae40..917114abfdf6 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 260f4f8efa46..461021d8fd68 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 a24a582925bf..f8d6e1676b68 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -99,7 +99,7 @@ #include <vcl/fixed.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/help.hxx> #include <vcl/idle.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index f8fbba2442d0..4b0505237801 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -139,7 +139,7 @@ #include <vcl/gfxlink.hxx> #include <vcl/gradient.hxx> #include <vcl/graph.h> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/hatch.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 9e5c4a791021..c0a2c8653f5e 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -21,7 +21,7 @@ #include "epptdef.hxx" #include <tools/globname.hxx> #include <tools/poly.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/bmpacc.hxx> #include <vcl/gradient.hxx> #include <rtl/ustring.hxx> diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index b24d797dcfab..02ffe21b92e0 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -23,7 +23,7 @@ #include "escherex.hxx" #include <sal/types.h> #include <sot/storage.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <unotools/fontcvt.hxx> #include "pptexanimations.hxx" #include <pptexsoundcollection.hxx> diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 450b835a6bae..504957ff1630 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -24,7 +24,7 @@ #include <tools/datetime.hxx> #include <tools/poly.hxx> #include <tools/stream.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/bmpacc.hxx> #include <vcl/gradient.hxx> #include <vcl/virdev.hxx> diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 2d07d782e135..07863e3b7570 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -29,7 +29,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/oslfile2streamwrap.hxx> #include <comphelper/processfactory.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/virdev.hxx> #include <vcl/image.hxx> #include <unotools/pathoptions.hxx> diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 214d5bf816af..784bac0f1a59 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -31,7 +31,7 @@ #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <svtools/valueset.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svl/eitem.hxx> #include <svtools/colrdlg.hxx> #include <editeng/colritem.hxx> diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 3b0b102612f4..c341a2c0868e 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -28,7 +28,7 @@ #include <editeng/bulletitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/brushitem.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <editeng/lrspitem.hxx> #include <editeng/numitem.hxx> #include <svl/cjkoptions.hxx> diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 2f27d91b2495..877e5238d9df 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -33,7 +33,7 @@ //<- Fonts & Items #include <editeng/bulletitem.hxx> #include <editeng/brushitem.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> #include <editeng/numitem.hxx> diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 76a636999fd0..18171350e5ac 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SD_SOURCE_UI_INC_SDXFER_HXX #include <svtools/transfer.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <sfx2/objsh.hxx> #include <svl/lstner.hxx> diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index af9a9ea1a655..f976490086dd 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -23,7 +23,7 @@ #include <rtl/ref.hxx> #include <sal/types.h> #include <vcl/timer.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include "Window.hxx" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index cebb95bc1d91..720ff6d5ee78 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -83,7 +83,7 @@ #include <unotools/useroptions.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <vcl/waitobj.hxx> diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 46abdffd0bfc..f8f3fd0acd2f 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -39,7 +39,7 @@ #include <svx/svxids.hrc> #include <svx/xtable.hxx> #include <svx/gallery.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <sot/storage.hxx> diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9cd5e901ce64..c483bada3826 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -26,7 +26,7 @@ #include <svx/svdetc.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svx/xexch.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index d599a0dc1f89..3d246797d3cc 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 74ef914677f8..e39c5c0187ec 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 5690a2e4f337..9caed24180fe 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 950c32612895..4163539d7a77 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 a866b0d0a619..b085229baeb3 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 f4a49efdd20d..8109d2cb7860 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 082074877270..ff5e875c8e0d 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 908c3667938a..0a974997ac9e 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 f1548fe8ee99..8bb0bdd009e0 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 d6f824f955ee..c5875c0829d3 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 684c07a57617..5c95f290b4b7 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 e3674d9867f8..3a7b01678b11 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 bcd65e5ec164..bb938d83a760 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 ebe0d29e2c1a..70abae2c01f4 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 a762bde811a6..1001080ac8f6 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 24045bd9263c..7d3cdcb5b786 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 ccfea396b7d7..4df0ca32dda2 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 f7de053a80b5..bd5eda512fe7 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 0bca9eef5f72..2cee3ba9efb9 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 f6fb07e0344e..52689a26f9d7 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 0f4ed9b865d0..d9b9cced06ff 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 db467e547a2d..6bee33cc418a 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SVX_INC_GALLERYCONTROL_HXX #include <vcl/window.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <tools/urlobj.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 8398a7d366c3..720446d699a6 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_INC_GALOBJ_HXX #include <tools/urlobj.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include "svx/galmisc.hxx" #define S_THUMB 80 diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 4c74ffb171fa..a040847bad22 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -100,7 +100,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/gfxlink.hxx> #include <vcl/gradient.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/group.hxx> #include <vcl/hatch.hxx> #include <vcl/idle.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index ac6c37707398..ac46acd2da52 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -128,7 +128,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/gfxlink.hxx> #include <vcl/graph.h> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index 3f9c22b45cef..cd402c592ad6 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -10,7 +10,7 @@ #include <svx/extedit.hxx> #include <vcl/svapp.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/graphicfilter.hxx> #include <svx/xoutbmp.hxx> diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 3f65607b0157..9e6567a89edc 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -18,7 +18,7 @@ */ #include <dlgunit.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index aca7ecdf70c8..7af5341e2ebb 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -22,7 +22,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> #include <vcl/msgbox.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <sfx2/sfxsids.hrc> #include <svx/svxids.hrc> #include <svx/dialogs.hrc> diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 953f062a2095..7b3984adfe85 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -31,7 +31,7 @@ #include <editeng/brushitem.hxx> #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx index 58965e446b19..045d398d918d 100644 --- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx +++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx @@ -25,7 +25,7 @@ #include <drawinglayer/attribute/fillhatchattribute.hxx> #include <drawinglayer/attribute/sdrfillgraphicattribute.hxx> #include <svx/xfillit0.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 78d4a7c65609..9d0eacf225d7 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -32,7 +32,7 @@ #include <editeng/brushitem.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/settings.hxx> #include <unotools/streamwrap.hxx> diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index d2c9943113e5..3238cb6697ae 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -25,7 +25,7 @@ #include <i18nlangtag/mslangid.hxx> #include <svtools/valueset.hxx> #include <editeng/brushitem.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/settings.hxx> namespace svx { namespace sidebar { diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx index dafb10e3c6c7..e05c0d3a4bed 100644 --- a/svx/source/unodraw/UnoGraphicExporter.hxx +++ b/svx/source/unodraw/UnoGraphicExporter.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> class SdrObject; diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 8abfe5c3339c..9ef9262bc6db 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -25,7 +25,7 @@ #include <svx/fmmodel.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <svl/itemprop.hxx> #include <svl/itempool.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index c649d704ebd3..152683fac47e 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 7c849dd692d2..94155cba120b 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 cffda4dd1bba..9d818e9f05a6 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 ce7e63f79ad9..c2dc3e1e656f 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 8446e63ddb42..8d12363c49ca 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 2092fe8f8d22..44fe09d56c31 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 d7aabd1995c1..2193796685ec 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 d28a18be387c..01026dc83596 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 becc8ad52e5e..2b8fe074e732 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 1ec230e12172..134205811180 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 2a2eaab5fd2e..f5b85c9a2275 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 e738e7ca04ab..27ff359741ae 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 af8329ee454a..c173adc5373a 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 12d04664d4d4..15d6fcddaaf8 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 277934b50b28..f83359d1dc53 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 07241c81425b..e230ace13b4a 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 0da911b0ae84..aaa4601bfd54 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 442147a745e0..1f4d446cd300 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 4b8b238a7a02..73452d9e61b5 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 2c609e186b11..f6d6b75fad0c 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 0cd0cc34ee14..49ce99d1bd34 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 1218818e8109..e45bb4b62c9f 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 b98305fe2894..7de2e33bf5e8 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 cf0c1ac6f36e..bc6a1b6aece6 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 e7ae8201869a..ddd9e0e999f1 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 c2353f0a7cd7..6c7a6beceebc 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 f657be072c44..b604f7f080aa 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 344bb4c84a3b..ab7ed26e67f9 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 da80ab65ea71..5b5c9698c44d 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 1bb0f2faa259..8c31f20579de 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 b6489a0c9360..d8b74211991f 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 3794a374ca4b..5164dc88c9ea 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 cfc7956f33cd..5179f77d0950 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 2f440f6573c7..bbf225df2f26 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 c45b697fb617..d99c63c713dc 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 0711f2337673..e4c80787fdc7 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 edfa8acd391f..c7e291312c38 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 701a8eaa53dc..ef10bc7815d8 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 18e2d2ce16bc..36b2f5d0ad49 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 a7aa6fb3aab5..962fc53d8225 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 cce3aabae0a2..7bd5f7db6329 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 32cf5cf6d1ae..5c83e919cf52 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 07ceea37ac5b..71e86bf6a759 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 1756a0332d6e..f841360b5d79 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 index 5c23e0acabdd..e55a440a42fe 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 21d2119e7a99..d77d1b0e5214 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 0466cfb7a3cf..75ce7de43b2a 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" #include "vcl/gfxlink.hxx" #include "vcl/dllapi.h" diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 0d144284dad3..aede71ae4249 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -24,7 +24,7 @@ #include "vcl/gdimtf.hxx" #include "vcl/metaact.hxx" #include "vcl/bmpacc.hxx" -#include "vcl/graph.hxx" +#include <vcl/graphic.hxx> #include "svdata.hxx" diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index d224da1d0a7b..bc9c9441bca6 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -25,7 +25,7 @@ #include <tools/resmgr.hxx> #include <vcl/settings.hxx> #include <vcl/outdev.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/svapp.hxx> #include <vcl/image.hxx> diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx index 80806ece136f..4f586f6892d6 100644 --- a/vcl/source/image/ImageList.cxx +++ b/vcl/source/image/ImageList.cxx @@ -25,7 +25,7 @@ #include <tools/resmgr.hxx> #include <vcl/settings.hxx> #include <vcl/outdev.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/svapp.hxx> #include <vcl/image.hxx> diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index bdd6a4e7e08e..a00947649aaf 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -17,7 +17,7 @@ #include <vcl/pngwrite.hxx> #include <vcl/bmpacc.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <osl/thread.hxx> diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index ee3e1b6e06ba..00341d47ce00 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -20,7 +20,7 @@ #include <vcl/bmpacc.hxx> #include <memory> #include <vcl/pngwrite.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/svapp.hxx> #include <officecfg/Office/Common.hxx> #include <com/sun/star/util/XFlushable.hpp> diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index f5028b92c4ee..e8f8ca56ce47 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -35,7 +35,7 @@ #include <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/image.hxx> #include <vcl/openglwin.hxx> diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 1d25daf649a0..cf9ec13ffc84 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -34,7 +34,7 @@ #include <vcl/imgctrl.hxx> #include <vcl/bitmapex.hxx> #include <vcl/graphicfilter.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <tools/extendapplicationenvironment.hxx> #include <tools/stream.hxx> diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index acc30e15f155..6bf4e3e9c4e9 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.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> |