removetooltypes01: rebase to DEV300_m96

38 files changed, 47 insertions, 45 deletions

diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx
index 5d163e827239..5d163e827239 100644
--- a/linguistic/inc/hyphdta.hxx
+++ b/linguistic/inc/linguistic/hyphdta.hxx
diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx
index 2deef9539fbc..2deef9539fbc 100644
--- a/linguistic/inc/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/linguistic/lngprops.hxx
index 68f599d50a8c..68f599d50a8c 100644
--- a/linguistic/inc/lngprops.hxx
+++ b/linguistic/inc/linguistic/lngprops.hxx
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index 2b49f37858c0..2b49f37858c0 100644
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
diff --git a/linguistic/inc/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index 7ab7cab06b56..7ab7cab06b56 100644
--- a/linguistic/inc/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst
index b85d4cfd9d73..0043eaffc6ed 100644
--- a/linguistic/prj/build.lst
+++ b/linguistic/prj/build.lst
@@ -1,4 +1,4 @@
-lg  linguistic  :   svl xmloff ucbhelper vos comphelper ICU:icu NULL
+lg  linguistic  :   svl xmloff ucbhelper vos comphelper ICU:icu LIBXSLT:libxslt NULL
 lg	linguistic								usr1	-	all	lg_mkout NULL
 lg	linguistic\prj							get		-	all	lg_prj NULL
 lg	linguistic\inc							nmake	-	all	lg_inc NULL
diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst
index 0e0534feafd8..03237f925764 100644
--- a/linguistic/prj/d.lst
+++ b/linguistic/prj/d.lst
@@ -7,5 +7,7 @@
 ..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
 
 mkdir: %_DEST%\inc%_EXT%\linguistic
-..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+
 ..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component
+
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index fadfb26857c9..f199c6630908 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -66,7 +66,7 @@
 
 #include "convdic.hxx"
 #include "convdicxml.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace std;
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index a0276cb57156..77346927df9b 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -38,7 +38,7 @@
 #include <hash_map>
 #include <set>
 #include <memory>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 // text conversion dictionary extension
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index cfaa9e8e7b29..f1af7ea597df 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -53,7 +53,7 @@
 #include "convdiclist.hxx"
 #include "convdic.hxx"
 #include "hhconvdic.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 //using namespace utl;
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index fb82409edce0..206f88bf1c22 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -36,7 +36,7 @@
 #include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "lngopt.hxx"
 
 
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 071f6231f358..64e6f7a071bd 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -58,7 +58,7 @@
 
 #include "convdic.hxx"
 #include "convdicxml.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace std;
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 3ed260a58b6d..edf5ebe104d1 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -38,7 +38,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/string.hxx>
 #include <rtl/ustring.hxx>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 2ad110e9a41f..3c186ecf517b 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -40,7 +40,7 @@
 #include <tools/stream.hxx>
 
 #include "defs.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 325e3b248250..ca88be6660ca 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -41,7 +41,7 @@
 #include <vector>
 #include <memory>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "lngopt.hxx"
 
 class DicEvtListenerHelper;
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index f06cbd2790af..4f4bc1ea36b8 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -67,7 +67,7 @@
 #include <map>
 #include <vector>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include "lngopt.hxx"
 
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index ae0ed6610bdf..4fa2986b587d 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -34,7 +34,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 1496f50dece8..d54bdbe4bbfa 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include "hhconvdic.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace utl;
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index 9bdecf0903fc..8d30ea2fd812 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -35,7 +35,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/string.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include "convdic.hxx"
 
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index a6fc2c7b8888..d296a8a56bfb 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -42,8 +42,8 @@
 #include <osl/mutex.hxx>
 
 #include "hyphdsp.hxx"
-#include "hyphdta.hxx"
-#include "lngprops.hxx"
+#include "linguistic/hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
 #include "lngsvcmgr.hxx"
 
 
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index c3a8912e1068..8271c5f08969 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -45,7 +45,7 @@
 #include <map>
 
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 class LngSvcMgr;
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index a48af35f4756..32c755ad7758 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
 
-#include "hyphdta.hxx"
-#include "lngprops.hxx"
-#include "misc.hxx"
+#include "linguistic/hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/misc.hxx"
 #include <osl/mutex.hxx>
 
 
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index 2c87804178b3..bdde4e6851ff 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "iprcache.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
 #include <tools/debug.hxx>
@@ -57,7 +57,7 @@
 #endif
 #include <unotools/processfactory.hxx>
 
-#include <lngprops.hxx>
+#include <linguistic/lngprops.hxx>
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index ecdfa00f436c..95cde6a32812 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -29,8 +29,8 @@
 #include "precompiled_linguistic.hxx"
 
 #include "lngopt.hxx"
-#include "lngprops.hxx"
-#include "misc.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/misc.hxx"
 #include <tools/debug.hxx>
 #include <unotools/lingucfg.hxx>
 
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 31c0d61337e9..ecfa5461e2c3 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -45,7 +45,7 @@
 #include <tools/solar.h>
 
 #include <svl/itemprop.hxx>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include <vos/refernce.hxx>
 
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 88c6900814b2..88c5c7829cee 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -36,10 +36,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/mutex.hxx>
 
-#include <misc.hxx>
-#include <lngprops.hxx>
+#include <linguistic/misc.hxx>
+#include <linguistic/lngprops.hxx>
 
-#include <lngprophelp.hxx>
+#include <linguistic/lngprophelp.hxx>
 
 
 //using namespace utl;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 92b8f519b040..d4b7ab62e5f4 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -49,7 +49,7 @@
 
 #include "lngsvcmgr.hxx"
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "spelldsp.hxx"
 #include "hyphdsp.hxx"
 #include "thesdsp.hxx"
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 28fc86460516..9116b36f767b 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -42,7 +42,7 @@
 
 //#include <vcl/timer.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 class SpellCheckerDispatcher;
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index ac93ec9c24f2..f0a26ca50f09 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -53,10 +53,10 @@
 
 #include <rtl/instance.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
-#include "lngprops.hxx"
-#include "hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/hyphdta.hxx"
 #include <i18npool/mslangid.hxx>
 
 using namespace utl;
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index e59fa6ecfbec..dde8768ac283 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 using namespace com::sun::star;
 
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 36b2d1580a7c..6cc73236a5de 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -43,9 +43,9 @@
 #include <vector>
 
 #include "spelldsp.hxx"
-#include "spelldta.hxx"
+#include "linguistic/spelldta.hxx"
 #include "lngsvcmgr.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 
 
 using namespace utl;
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 6c1e2ce5d589..99c8eeefbc6b 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -29,7 +29,7 @@
 #define _LINGUISTIC_SPELLDSP_HXX_
 
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "iprcache.hxx"
 
 #include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 450a5d9a4e23..158ff9073d56 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -37,7 +37,7 @@
 
 #include <vector>
 
-#include "spelldta.hxx"
+#include "linguistic/spelldta.hxx"
 #include "lngsvcmgr.hxx"
 
 
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 05fc0359e079..8cf9110c7570 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -38,7 +38,7 @@
 #include <osl/mutex.hxx>
 
 #include "thesdsp.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx
index 61d46b01f435..1978923a59ff 100644
--- a/linguistic/source/thesdta.cxx
+++ b/linguistic/source/thesdta.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 
-#include <misc.hxx>
+#include <linguistic/misc.hxx>
 
 #include "thesdta.hxx"
 
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 0a02bc22bb58..dcfa1d240cde 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 #include "sprophelp.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 #include <tools/debug.hxx>
 
 #include <com/sun/star/linguistic2/LinguServiceEvent.hpp>
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 81981093e2f8..38123a144655 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -41,8 +41,8 @@
 #include <sspellimp.hxx>
 #endif
 
-#include "lngprops.hxx"
-#include "spelldta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/spelldta.hxx"
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index df37c403572f..e6796afc6356 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
 #include <tools/table.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "sprophelp.hxx"
 
 using namespace ::rtl;