#i107450#: move SvxSearchIten to svl

10 files changed, 7 insertions, 43 deletions

diff --git a/svx/inc/srchitem.hxx b/svx/inc/srchitem.hxx
index c31cdfb25fc5..cb40fd980273 100644
--- a/svx/inc/srchitem.hxx
+++ b/svx/inc/srchitem.hxx
@@ -30,7 +30,7 @@
 #ifndef _SVX_SRCHITEM_HXX
 #define _SVX_SRCHITEM_HXX
 
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 
 #endif
 
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index a55fe24d6955..a80b76931364 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -44,7 +44,7 @@
 
 #include "srchctrl.hxx"
 #include "srchdlg.hxx"
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 
 // class SvxSearchFamilyControllerItem -----------------------------------
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 106ac49706ef..9d114d74844b 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -67,7 +67,7 @@
 
 #define ITEMID_SETITEM      0
 
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/pageitem.hxx>
 #include "srchctrl.hxx"
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx
index e0e34ed085d4..fc72f1d9b707 100644
--- a/svx/source/editeng/acorrcfg.cxx
+++ b/svx/source/editeng/acorrcfg.cxx
@@ -32,8 +32,7 @@
 #include "precompiled_svx.hxx"
 
 #include "acorrcfg.hxx"
-#include <sfx2/app.hxx>
-
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/urihelper.hxx>
diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx
index 2c72d7f1b63f..8463494e6d8e 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/svx/source/editeng/editeng.cxx
@@ -81,13 +81,12 @@
 #include <bulitem.hxx>
 #include <unolingu.hxx>
 #include <linguistic/lngprops.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <i18npool/mslangid.hxx>
 #include <vcl/help.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
 
-#include <sfx2/srchdefs.hxx>
+#include <svl/srchdefs.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <svx/frmdiritem.hxx>
diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx
index 9a000813fe09..17ec1b4321ef 100644
--- a/svx/source/editeng/editview.cxx
+++ b/svx/source/editeng/editview.cxx
@@ -42,7 +42,7 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/langtab.hxx>
 
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx
index 44e8086e1748..c6cc53b65e0f 100644
--- a/svx/source/editeng/impedit.cxx
+++ b/svx/source/editeng/impedit.cxx
@@ -38,28 +38,21 @@
 #include <svx/editview.hxx>
 #include <tools/poly.hxx>
 #include <unolingu.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <com/sun/star/linguistic2/XDictionaryEntry.hpp>
 #include <com/sun/star/linguistic2/DictionaryType.hpp>
 #include <com/sun/star/linguistic2/DictionaryEvent.hpp>
 #include <com/sun/star/linguistic2/XDictionaryEventListener.hpp>
 #include <com/sun/star/linguistic2/DictionaryEventFlags.hpp>
 #include <com/sun/star/linguistic2/XDictionary.hpp>
-
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DNDCONSTANS_HPP_
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-#endif
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-
 #include <vos/mutex.hxx>
-
 #include <svx/flditem.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/transfer.hxx>
-
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx
index 9e8236f3b536..9f95a21993a1 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/svx/source/editeng/impedit2.cxx
@@ -59,16 +59,8 @@
 #include <svx/scripttypeitem.hxx>
 #include <svx/frmdiritem.hxx>
 #include <fontitem.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <sfx2/dispatch.hxx>
 #include <vcl/cmdevt.h>
 
-#ifndef SVX_LIGHT
-#ifndef _SFXFRAME_HXX //autogen
-#include <sfx2/frame.hxx>
-#endif
-#endif
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index 72cf588bc6a1..d3f29fabefbf 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -38,16 +38,11 @@
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
 
-#ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
-#endif
-
 #include <svx/adjitem.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/lspcitem.hxx>
-
 #include <svx/flditem.hxx>
-
 #include <impedit.hxx>
 #include <svx/editeng.hxx>
 #include <svx/editview.hxx>
@@ -78,7 +73,6 @@
 
 #include <math.h>
 #include <vcl/svapp.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <vcl/metric.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/text/CharacterCompressionType.hpp>
diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx
index 6b0eb745d9c2..a5427a8d00e3 100644
--- a/svx/source/editeng/impedit4.cxx
+++ b/svx/source/editeng/impedit4.cxx
@@ -33,12 +33,9 @@
 
 #include <eeng_pch.hxx>
 
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <vcl/svapp.hxx>
-
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/lspcitem.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/tstpitem.hxx>
@@ -74,29 +71,19 @@
 #include <svx/emphitem.hxx>
 #include <textconv.hxx>
 #include <svx/svxdlg.hxx>
-
 #include <rtl/tencinfo.h>
-
 #include <svtools/rtfout.hxx>
-
-#ifndef SVX_LIGHT
 #include <edtspell.hxx>
-#endif
 #include <svx/scripttypeitem.hxx>
 #include <unolingu.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/linguistic2/XMeaning.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <unotools/transliterationwrapper.hxx>
-
-#ifndef _TXTCMP_HXX //autogen
 #include <unotools/textsearch.hxx>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <vcl/help.hxx>
-
 #include <svtools/rtfkeywd.hxx>
 
 using namespace ::com::sun::star;