Make LO buildable again after the GraphicFilter move.

Conflicts:
	svtools/Library_svt.mk
q#

Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
Signed-off-by: Cor Nouws <oolst@nouenoff.nl>
Signed-off-by: Olivier Hallot <olivier.hallot@documentfoundation.org>
Signed-off-by: Adolfo Jayme Barrientos <fitoschido@ubuntu.com>
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

14 files changed, 20 insertions, 20 deletions

diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index b44b262f759f..7754075b25e2 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -30,7 +30,7 @@
 #include <osl/thread.hxx>
 #include <osl/process.h>
 #include <osl/time.h>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <svtools/filechangedchecker.hxx>
 #include <svx/xoutbmp.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 723074ac624a..2cc0c7cc8cad 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -20,7 +20,7 @@
 #include <tools/string.hxx>
 #include <svx/graphichelper.hxx>
 #include <unotools/pathoptions.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/xoutbmp.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 72329365182f..0534ee869b7d 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -19,13 +19,13 @@
 
 #include <dlgunit.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/sdgcpitm.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/compressgraphicdialog.hxx>
-#include <svtools/filter.hxx>
 #include <sfx2/dispatch.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index ead880ae688d..d72f47749df3 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -30,7 +30,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
 #include <editeng/brshitem.hxx>
 #include "helpid.hrc"
 #include "svx/gallery.hxx"
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 9f3d0d0af57c..944950c11717 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -32,7 +32,7 @@
 #include "galobj.hxx"
 #include <avmedia/mediawindow.hxx>
 #include "gallery.hrc"
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
 
 // -----------
 // - Defines -
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index f5c25e3eb05e..5ff8acf83458 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -27,13 +27,13 @@
 #include <tools/urlobj.hxx>
 #include <svl/solar.hrc>
 #include <svl/urihelper.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <svl/itempool.hxx>
 #include <sfx2/docfile.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <vcl/svapp.hxx>
 
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/fmmodel.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 5fd1aa33a729..c3363919c636 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -28,7 +28,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <svl/style.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <svl/urihelper.hxx>
 #include <svtools/grfmgr.hxx>
 #include <vcl/svapp.hxx>
@@ -45,7 +45,7 @@
 #include <svx/svdpagv.hxx>
 #include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/xbitmap.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 5eef368cde78..cb0760e65b72 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -42,7 +42,7 @@
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/convert.hxx>
 
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <svtools/embedhlp.hxx>
 
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 8d08bf7aa283..d1467bfeb533 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -45,7 +45,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
 #include <svl/outstrm.hxx>
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -56,7 +56,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
 #include "svx/xoutbmp.hxx"
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
 #include "svx/unoapi.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 8a02d44ee0be..6ce719e1bc3b 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -32,7 +32,7 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <svtools/fltcall.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
 
 #include <boost/scoped_ptr.hpp>
 #include <svx/svdpool.hxx>
@@ -58,7 +58,7 @@
 #include <basegfx/tools/unotools.hxx>
 
 #include <comphelper/servicehelper.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
 
 using ::rtl::OUString;
 using namespace ::osl;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 27f3f074b1e1..c516b6ff6563 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -37,7 +37,7 @@
 
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
 
 #include <svx/svdmodel.hxx>
 #include "shapeimpl.hxx"
@@ -49,7 +49,7 @@
 #include "svx/svdview.hxx"
 #include "svx/svdglob.hxx"
 #include "svx/svdstr.hrc"
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
 
 ///////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 511b94167118..dc41794de75f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -91,7 +91,7 @@
 #include "svx/extrud3d.hxx"
 
 #include <boost/bind.hpp>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
 
 using ::rtl::OUString;
 using namespace ::osl;
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index d428c147b195..4fb5058a0b23 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -38,7 +38,7 @@
 #include <vcl/metaact.hxx>
 #include <tools/zcodec.hxx>
 
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
 #include "svx/xmlgrhlp.hxx"
 #include "svx/xmleohlp.hxx"
 
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 22bad4a21b1a..69bb1e98a52a 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -27,8 +27,8 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include "svx/xoutbmp.hxx"
-#include <svtools/FilterConfigItem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/FilterConfigItem.hxx>
+#include <vcl/graphicfilter.hxx>
 
 // -----------
 // - Defines -