14 files changed, 25 insertions, 66 deletions
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index fd195b18a7e3..3d6b4280cefc 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -31,18 +31,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "connpooloptions.hxx"
-#ifndef _OFFAPP_CONNPOOLOPTIONS_HRC_
 #include "connpooloptions.hrc"
-#endif
 #include <svtools/editbrowsebox.hxx>
 #include <vcl/field.hxx>
 #include "connpoolsettings.hxx"
 #include <svl/eitem.hxx>
-
 #include <cuires.hrc>
 #include "helpid.hrc"
 #include <dialmgr.hxx>
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 03951a4ee271..3d18e50795c3 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -31,9 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cui.hxx"
 
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
 #include "connpoolsettings.hxx"
 
 //........................................................................
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index c958204fe3c4..b2da78b05199 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -54,12 +54,12 @@
 
 #define ITEMID_SETITEM      0
 
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/pageitem.hxx>
 #include <dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <optjsearch.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include "backgrnd.hxx"
 
 
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 0bbf0ac287bd..2a663a0d440a 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -32,14 +32,14 @@
 #include "precompiled_cui.hxx"
 
 #include <optasian.hxx>
-#include <svx/langitem.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <optasian.hrc>
 #include <dialmgr.hxx>
 #include <cuires.hrc>
 #include <tools/table.hxx>
 #include <tools/shl.hxx>
-#include <svx/asiancfg.hxx>
+#include <svl/asiancfg.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index e56089dd351e..edfbface5aba 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <svx/dlgutil.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <svl/eitem.hxx>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 656eca17fd22..0205539a86c6 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_cui.hxx"
 #include <svl/zforlist.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svl/flagitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <unotools/lingucfg.hxx>
@@ -69,12 +69,13 @@
 #include <svx/dlgutil.hxx>
 #include "cuitabarea.hxx"
 #include <cuires.hrc>
-#include <svx/unolingu.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/langitem.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
-
-
+#include <editeng/editids.hrc>
+#include <svx/svxids.hrc>
+#include <svl/intitem.hxx>
 #include <dialmgr.hxx>
 #include <svtools/helpopt.hxx>
 #include <unotools/saveopt.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 85c0d450cc47..6f62f0962db4 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -36,6 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/saveopt.hxx>
+#include <svl/intitem.hxx>
 
 #define _SVX_OPTGENRL_CXX
 
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index bddcd4a9e182..47167a474db5 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -34,8 +34,7 @@
 // include ---------------------------------------------------------------
 
 #include <svtools/langtab.hxx>
-
-#include <svx/htmlcfg.hxx>
+#include <svtools/htmlcfg.hxx>
 #include "opthtml.hxx"
 #include "opthtml.hrc"
 #include <cuires.hrc>
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 00d1aaadc4fc..5664a71b1bbd 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -38,7 +38,7 @@
 #include <svtools/stdctrl.hxx>
 #include <svtools/svtabbx.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svx/srchcfg.hxx>
+#include <svl/srchcfg.hxx>
 
 #ifdef _SVX_OPTINET2_CXX
 #include <svtools/headbar.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 7ca67a553278..3193ec48e99f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -40,7 +40,7 @@
 #include <tools/dynary.hxx>
 #include <i18npool/mslangid.hxx>
 #include <unotools/lingucfg.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <svx/dlgutil.hxx>
 #include <linguistic/lngprops.hxx>
 #include <linguistic/misc.hxx>
@@ -73,7 +73,7 @@
 #include "optlingu.hrc"
 
 #include <svx/svxdlg.hxx>
-#include <svx/optitems.hxx>
+#include <editeng/optitems.hxx>
 #include "optlingu.hxx"
 #include <dialmgr.hxx>
 #include <cuires.hrc>
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index a72660ba2e0f..cd813216ab28 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_cui.hxx"
 #include <svtools/langtab.hxx>
 #include <svl/zforlist.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svl/flagitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <unotools/lingucfg.hxx>
@@ -55,8 +55,8 @@
 #include <unotools/configitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <comphelper/types.hxx>
-#include <svx/unolingu.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/langitem.hxx>
 #include "cuioptgenrl.hxx"
 #include "optpath.hxx"
 #include "optsave.hxx"
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 8e004b54b018..b9bd1c52d549 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -256,7 +256,7 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) :
     Size aHeadSize = pHeaderBar->GetSizePixel();
 
     WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP;
-    pPathBox = new OptHeaderTabListBox( &aPathCtrl, nBits );
+    pPathBox = new svx::OptHeaderTabListBox( &aPathCtrl, nBits );
     aPathCtrl.SetFocusControl( pPathBox );
     pPathBox->SetWindowBits( nBits );
     pPathBox->SetDoubleClickHdl( aLink );
@@ -409,7 +409,7 @@ void SvxPathTabPage::FillUserData()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SvxPathTabPage, PathSelect_Impl, OptHeaderTabListBox *, EMPTYARG )
+IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG )
 
 /*  [Beschreibung]
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b45a19af4a70..8d28994b7a30 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -113,7 +113,7 @@
 #include "treeopt.hxx"
 #include "treeopt.hrc"
 #include "fontsubs.hxx"
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <svx/xtable.hxx>
 #include "connpoolconfig.hxx"
 #include "dbregister.hxx"
@@ -123,11 +123,11 @@
 
 #ifndef _SVX_LANGITEM_HXX
 #define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE
-#include <svx/langitem.hxx>
+#include <editeng/langitem.hxx>
 #endif
 
 
-#include <svx/optitems.hxx>
+#include <editeng/optitems.hxx>
 
 #include <svx/drawitem.hxx>
 #include <rtl/uri.hxx>
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 05a67948da04..481eed4e0944 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -308,39 +308,6 @@ String RID_RIDER_SLL_PERSONAL
     Text [ en-US ] = "Personal certificates" ;
 };
 
-// RID_OFADLG_OPTIONS_TREE_WARNING ---------------------------------------
-
-ModalDialog RID_OFADLG_OPTIONS_TREE_HINT
-{
-    OutputSize = TRUE;
-    Size = MAP_APPFONT( 240, 105 );
-    Moveable = TRUE;
-    Closeable = TRUE;
-    FixedImage IMG_HINT
-    {
-        Pos = MAP_APPFONT( 6, 6 );
-        Size = MAP_APPFONT( 30, 30 );
-    };
-    FixedText FT_HINT
-    {
-        Pos = MAP_APPFONT( 39, 6 );
-        Size = MAP_APPFONT( 195, 60 );
-        WordBreak = TRUE;
-        Text [ en-US ] = "Please note: the settings displayed refer to the internal browser of %PRODUCTNAME (%PRODUCTNAME Writer/Web). In \"Tools - Options - Browser - External Browser\" the use of a different browser has been activated. In order to be able to use the same settings in other browsers you need to define these in the external browser settings.";
-    };
-    CheckBox CB_DISABLE
-    {
-        Pos = MAP_APPFONT( 39, 69 );
-        Size = MAP_APPFONT( 195, 12 );
-        Text [ en-US ] = "~Do not show information again";
-    };
-    OKButton BTN_HINT
-    {
-        Pos = MAP_APPFONT( 95, 85 );
-        Size = MAP_APPFONT( 50, 14 );
-    };
-};
-
 // ******************************************************************* EOF