diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-11 11:16:34 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-11 13:37:21 +0100 |
commit | 7fbb96c2fbf99c47eca6f493f54fc3974f55cf86 (patch) | |
tree | c700a011983d1868ed08415de277ec82d2852074 /include/svx | |
parent | Allow use of "git worktree" in Makefile.in (diff) | |
download | core-7fbb96c2fbf99c47eca6f493f54fc3974f55cf86.tar.gz core-7fbb96c2fbf99c47eca6f493f54fc3974f55cf86.zip |
Move (and rename) graphic stuff from svtools to vcl
This is preparing to change how GraphicManager works where it
won't base itself around GraphicObject anymore but Graphic. No
functional or cosmetic change was made to the classes, only
changes that were needed because of the move and rename.
The only thing that wasn't moved is the GraphicRenderer as it
is not needed in vcl for now (but makes sense to move it in the
future to keep graphic stuff together).
grfmgr was renamed to GraphicObject as the GraphicManager will be
changed a lot and most likely moved out, so the name grfmgr won't
make any sense anymore.
All the UNO implementations were renamed with a prefix Uno and
used the same name as the class name. This is made to be more
specific which are the Uno objects (for example graphic.cxx
contained the implementation of XGraphic, which is similar to
graph.cxx contains Graphic).
Change-Id: I54a2fa6c7e997469aaa7770db05244adb9f64137
Reviewed-on: https://gerrit.libreoffice.org/51068
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/galctrl.hxx | 2 | ||||
-rw-r--r-- | include/svx/grfflt.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdgmoitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdograf.hxx | 2 | ||||
-rw-r--r-- | include/svx/unoapi.hxx | 2 | ||||
-rw-r--r-- | include/svx/xbitmap.hxx | 2 | ||||
-rw-r--r-- | include/svx/xbtmpit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xmlgrhlp.hxx | 2 | ||||
-rw-r--r-- | include/svx/xtable.hxx | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 1ca339904fb8..953b53c18490 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -33,7 +33,7 @@ #include <svtools/transfer.hxx> #include <svtools/valueset.hxx> #include <svtools/brwbox.hxx> -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <svx/galmisc.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx index b3896c0e1387..2600ee999c8c 100644 --- a/include/svx/grfflt.hxx +++ b/include/svx/grfflt.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_GRFFLT_HXX #define INCLUDED_SVX_GRFFLT_HXX -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <svx/svxdllapi.h> enum class SvxGraphicFilterResult { diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 7e508e16cabd..e17149102821 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_SDGMOITM_HXX #define INCLUDED_SVX_SDGMOITM_HXX -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <svl/eitem.hxx> #include <svx/svddef.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index abea8f1b222e..65b934847489 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <vcl/graph.hxx> #include <svx/svdorect.hxx> -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <svx/svxdllapi.h> #include <o3tl/typed_flags_set.hxx> diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 8000220b2940..9c019a5a83a2 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <sal/types.h> -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <svl/poolitem.hxx> #include <svx/svxdllapi.h> #include <tools/fldunit.hxx> diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx index e062a0aebc5a..3f817cd4b0a5 100644 --- a/include/svx/xbitmap.hxx +++ b/include/svx/xbitmap.hxx @@ -23,7 +23,7 @@ #include <memory> #include <tools/color.hxx> #include <vcl/bitmap.hxx> -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <svx/xenum.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 7c2e2fa2582c..2f8e5f1181ee 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -22,7 +22,7 @@ #include <svx/svxdllapi.h> #include <svx/xit.hxx> -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <array> class SdrModel; diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 578b9a5f98fb..79d9123a58ef 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -22,7 +22,7 @@ #include <cppuhelper/compbase.hxx> #include <osl/mutex.hxx> -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <vector> #include <set> #include <utility> diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index 1012303e0586..e83155a0f5de 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -37,7 +37,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <com/sun/star/container/XNameContainer.hpp> -#include <svtools/grfmgr.hxx> +#include <vcl/GraphicObject.hxx> #include <svx/XPropertyEntry.hxx> #include <limits> |