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 /svtools | |
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>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/pch/precompiled_svt.hxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.hxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/graphic.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/grfcache.hxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/transfer2.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 2 |
9 files changed, 9 insertions, 9 deletions
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> |